summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | am 542b8f2b: merge from open-source masterThe Android Open Source Project2010-05-120-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '542b8f2b471cbac5a2f4b550eae65caf24266d36' into kraken * commit '542b8f2b471cbac5a2f4b550eae65caf24266d36': Fixing Swedish translations of a few texts under "Phone info".
| * | | merge from open-source masterThe Android Open Source Project2010-05-120-0/+0
| |\ \ \ | | | |/ | | |/| | | | | Change-Id: I0b8f7bedc11e98f2c790669bbbe5a7807947e196
| | * | Fixing Swedish translations of a few texts under "Phone info".Henrik Hall2010-05-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Build number * Firmware version Change-Id: Ifb8e84bcea86c7b95073e455f97f9b13c720c400
* | | | am 0b53ac73: merge from open-source masterThe Android Open Source Project2010-05-121-1/+5
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '0b53ac733c36e14a5e2e948393360bba00048ccb' into kraken * commit '0b53ac733c36e14a5e2e948393360bba00048ccb': The password in the APN settings is shown instead of stars
| * | | merge from open-source masterThe Android Open Source Project2010-05-121-1/+5
| |\ \ \ | | |/ / | | | | | | | | Change-Id: Iab9eddbfea000b9403c92a211c37b93772f2a9c7
| | * | Merge "The password in the APN settings is shown instead of stars"Romain Guy2010-05-111-1/+5
| | |\ \
| | | * | The password in the APN settings is shown instead of starsJiehua Dai2010-03-051-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The password is presented as stars in the edit box, also if one exits and then enters the APN editor the password is stars. With this patch the APN password is consistently starified.
* | | | | am 482eadea: am e434bfb2: String change - wifi tether = hotspotRobert Greenwalt2010-05-107-27/+50
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '482eadeae85a1764b86133172d11364df6ce7227' into kraken * commit '482eadeae85a1764b86133172d11364df6ce7227': String change - wifi tether = hotspot
| * | | | am e434bfb2: String change - wifi tether = hotspotRobert Greenwalt2010-05-107-27/+50
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | Merge commit 'e434bfb216682a6ca331fa54ce58a2bff7adf8d7' into froyo-plus-aosp * commit 'e434bfb216682a6ca331fa54ce58a2bff7adf8d7': String change - wifi tether = hotspot
| | * | | String change - wifi tether = hotspotRobert Greenwalt2010-05-087-27/+50
| | | | | | | | | | | | | | | | | | | | | | | | | bug:2664412 Change-Id: I6ca955e7fcc299ae1d69892c93c9250229610b19
* | | | | am 15bb4754: am d2c81986: b/2652059 Refresh UI after bond state changeMichael Chan2010-05-101-19/+18
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '15bb47545686395c0d94b54dd67c4f080fe625e5' into kraken * commit '15bb47545686395c0d94b54dd67c4f080fe625e5': b/2652059 Refresh UI after bond state change
| * | | | am d2c81986: b/2652059 Refresh UI after bond state changeMichael Chan2010-05-101-19/+18
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'd2c81986c236ed680cfae5e420561028ae4cc0d2' into froyo-plus-aosp * commit 'd2c81986c236ed680cfae5e420561028ae4cc0d2': b/2652059 Refresh UI after bond state change
| | * | | b/2652059 Refresh UI after bond state changeMichael Chan2010-05-071-19/+18
| | | | | | | | | | | | | | | | | | | | Change-Id: I8f8a939ba3f383aae36091986cea4e8a6eae13fb
* | | | | am d17eb48e: am 1308453b: b/2652059 Fixed the broken BT connects/disconnects ↵Michael Chan2010-05-041-0/+26
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | after unpair Merge commit 'd17eb48e9c87e02cbcb42899915dbfc921075231' into kraken * commit 'd17eb48e9c87e02cbcb42899915dbfc921075231': b/2652059 Fixed the broken BT connects/disconnects after unpair
| * | | | am 1308453b: b/2652059 Fixed the broken BT connects/disconnects after unpairMichael Chan2010-05-041-0/+26
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '1308453b16c2ca85a456bd4bb7f3c71c916bd83e' into froyo-plus-aosp * commit '1308453b16c2ca85a456bd4bb7f3c71c916bd83e': b/2652059 Fixed the broken BT connects/disconnects after unpair
| | * | | b/2652059 Fixed the broken BT connects/disconnects after unpairMichael Chan2010-05-031-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The unpair command was stuck in the queue. Change-Id: I803cb10adcfaedbe6fd202e0db463593880e4280
* | | | | am a359fb77: (-s ours) am 6d409870: Import revised translationsKenny Root2010-04-290-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'a359fb77d41ab3ac00a1020b42fa2e898904c1af' into kraken * commit 'a359fb77d41ab3ac00a1020b42fa2e898904c1af': Import revised translations
| * | | | am 6d409870: Import revised translationsKenny Root2010-04-2940-857/+545
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '6d409870981361af2f547fba05877e7f405af75a' into froyo-plus-aosp * commit '6d409870981361af2f547fba05877e7f405af75a': Import revised translations
| | * | | Import revised translationsKenny Root2010-04-2940-857/+545
| | | | | | | | | | | | | | | | | | | | Change-Id: If5691d275bf86c94038a53beed65a93dad65b450
* | | | | am 3a1204f7: am 6078d450: Merge "b/2630339 Fixed the crash when an app ↵Michael Chan2010-04-281-27/+26
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | requests BT to be enabled" into froyo Merge commit '3a1204f7cd231ed1c451ca90901eae082541b9ef' into kraken * commit '3a1204f7cd231ed1c451ca90901eae082541b9ef': b/2630339 Fixed the crash when an app requests BT to be enabled
| * | | | am 6078d450: Merge "b/2630339 Fixed the crash when an app requests BT to be ↵Michael Chan2010-04-281-27/+26
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | enabled" into froyo Merge commit '6078d4503d6bc29fe6d2ff7784124a66fe48186e' into froyo-plus-aosp * commit '6078d4503d6bc29fe6d2ff7784124a66fe48186e': b/2630339 Fixed the crash when an app requests BT to be enabled
| | * | | Merge "b/2630339 Fixed the crash when an app requests BT to be enabled" into ↵Michael Chan2010-04-281-27/+26
| | |\ \ \ | | | | | | | | | | | | | | | | | | froyo
| | | * | | b/2630339 Fixed the crash when an app requests BT to be enabledMichael Chan2010-04-281-27/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For AlertActivity, the dialog needs to display at onCreate() time. Otherwise, the decor view would be made. Trying to display the dialog afterward would crash. Changed to AlertDialog instead. Change-Id: I2ea8463b4c475b9b54746d0a722fa80eea3d4529
* | | | | | am 9fef437e: am b3c872bf: Merge "Import revised translations" into froyoKenny Root2010-04-2841-685/+817
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '9fef437e04edd18f6406a49095403a1b71becf58' into kraken * commit '9fef437e04edd18f6406a49095403a1b71becf58': Import revised translations
| * | | | | am b3c872bf: Merge "Import revised translations" into froyoKenny Root2010-04-2841-685/+817
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'b3c872bf581e3f1ec3c6f03fbb90e43690de75b5' into froyo-plus-aosp * commit 'b3c872bf581e3f1ec3c6f03fbb90e43690de75b5': Import revised translations
| | * | | | Merge "Import revised translations" into froyoKenny Root2010-04-2841-685/+817
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Import revised translationsKenny Root2010-04-2841-685/+817
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I91401f661d61a86d166baac1cad14b8897d0a467
* | | | | | am 567ca080: am 64ab5338: Fix regression in removing settings that aren\'t ↵Amith Yamasani2010-04-271-105/+87
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | relevant for a platform. Merge commit '567ca0805e884c124e537edc7eac5cecf8d4e202' into kraken * commit '567ca0805e884c124e537edc7eac5cecf8d4e202': Fix regression in removing settings that aren't relevant for a platform.
| * | | | | am 64ab5338: Fix regression in removing settings that aren\'t relevant for a ↵Amith Yamasani2010-04-271-105/+87
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | platform. Merge commit '64ab5338cb0f90f8ee0787b0b98611670e6dee7e' into froyo-plus-aosp * commit '64ab5338cb0f90f8ee0787b0b98611670e6dee7e': Fix regression in removing settings that aren't relevant for a platform.
| | * | | | Fix regression in removing settings that aren't relevant for a platform.Amith Yamasani2010-04-271-105/+87
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 2630695 The PreferenceCategories added into the hierarchy caused removePreference() to not work, since the preferences to be removed were not immediate children of the preference screen. Create empty PreferenceCategory elements and pull the preferences to the same depth as the categories. Change-Id: I34826ea4d84cda0ecab75c66a73febe3d51e7c68
* | | | | am 0bca1653: am 6368b25c: Merge "b/2608693 Fix the problem where BT was ↵Michael Chan2010-04-231-25/+17
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automatically reconnecting ... after the user unpaired while docked." into froyo Merge commit '0bca1653cb78693e2c892efb48b944ddad98b66d' into kraken * commit '0bca1653cb78693e2c892efb48b944ddad98b66d': b/2608693 Fix the problem where BT was automatically reconnecting
| * | | | am 6368b25c: Merge "b/2608693 Fix the problem where BT was automatically ↵Michael Chan2010-04-231-25/+17
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reconnecting ... after the user unpaired while docked." into froyo Merge commit '6368b25c09992172b1900da3fd326c4fd2fdd203' into froyo-plus-aosp * commit '6368b25c09992172b1900da3fd326c4fd2fdd203': b/2608693 Fix the problem where BT was automatically reconnecting
| | * | | Merge "b/2608693 Fix the problem where BT was automatically reconnecting ... ↵Michael Chan2010-04-231-25/+17
| | |\ \ \ | | | | | | | | | | | | | | | | | | after the user unpaired while docked." into froyo
| | | * | | b/2608693 Fix the problem where BT was automatically reconnectingMichael Chan2010-04-221-25/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... after the user unpaired while docked. Change-Id: I65642f440109968387401fc3c103da0f2b15f49f
* | | | | | am b12b21a5: am b99e029d: Fix string for uninstall button for system apps.Suchi Amalapurapu2010-04-221-4/+5
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'b12b21a5b02468d601190de23f91675973ead44d' into kraken * commit 'b12b21a5b02468d601190de23f91675973ead44d': Fix string for uninstall button for system apps.
| * | | | | am b99e029d: Fix string for uninstall button for system apps.Suchi Amalapurapu2010-04-221-4/+5
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'b99e029db14ae276a47da39da9378b6af9aef403' into froyo-plus-aosp * commit 'b99e029db14ae276a47da39da9378b6af9aef403': Fix string for uninstall button for system apps.
| | * | | | Fix string for uninstall button for system apps.Suchi Amalapurapu2010-04-221-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iad26aae3d99447eddb6997e66c84080cdce727da
* | | | | | am a6bde3c9: am a3683a51: Enable moving packages when install location is ↵Suchi Amalapurapu2010-04-221-1/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | set to auto. Merge commit 'a6bde3c9cd0db85538ff6166cb35f626c303352b' into kraken * commit 'a6bde3c9cd0db85538ff6166cb35f626c303352b': Enable moving packages when install location is set to auto.
| * | | | | am a3683a51: Enable moving packages when install location is set to auto.Suchi Amalapurapu2010-04-221-1/+2
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'a3683a51faab316c1577cd13c708a41938bcc646' into froyo-plus-aosp * commit 'a3683a51faab316c1577cd13c708a41938bcc646': Enable moving packages when install location is set to auto.
| | * | | | Enable moving packages when install location is set to auto.Suchi Amalapurapu2010-04-221-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If081ad949cb2aed6b3555275c582e951e579ffc9
* | | | | | am dd379184: am f0746678: Merge "Redesign vibration settings." into froyoDaniel Sandler2010-04-214-62/+107
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'dd3791844f7172fc9f231e4d7666a8f81f86daa7' into kraken * commit 'dd3791844f7172fc9f231e4d7666a8f81f86daa7': Redesign vibration settings.
| * | | | | am f0746678: Merge "Redesign vibration settings." into froyoDaniel Sandler2010-04-214-62/+107
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'f07466782bb25ce4f2738133d0992f3531af28e5' into froyo-plus-aosp * commit 'f07466782bb25ce4f2738133d0992f3531af28e5': Redesign vibration settings.
| | * | | | Merge "Redesign vibration settings." into froyoDaniel Sandler2010-04-214-62/+107
| | |\ \ \ \
| | | * | | | Redesign vibration settings.Daniel Sandler2010-04-214-62/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Under the hood there remain three axes: 1. Are we in silent mode now? | RINGER_MODE_{VIBRATE,SILENT} 2. Do we vibrate in silent mode? | VIBRATE_IN_SILENT == 1 3. Do calls vibrate: | getVibrateSetting(VIBRATE_TYPE_RINGER) - always | == VIBRATE_SETTING_ON - never | == VIBRATE_SETTING_OFF - only in silent | == VIBRATE_SETTING_ONLY_SILENT We now expose this to the user much more simply by collapsing (2) and (3) above, and discarding states that don't make sense: - VIBRATE_SETTING_OFF + VIBRATE_IN_SILENT - VIBRATE_SETTING_ONLY_SILENT + !VIBRATE_IN_SILENT Now we offer the user four choices: Phone vibrate: * "Never" --> VIBRATE_IN_SILENT=0, VIBRATE_SETTING_OFF * "Always" --> VIBRATE_IN_SILENT=1, VIBRATE_SETTING_ON * "Only in silent mode" --> VIBRATE_IN_SILENT=1, VIBRATE_SETTING_ONLY_SILENT * "Only when not in silent mode" --> VIBRATE_IN_SILENT=0, VIBRATE_SETTING_ON This should make it easier to choose exactly the behavior the user wants as well as avoid nonsensical combinations of settings. Bug: 2598014 Change-Id: I9244d25ec97a3e2b572b71b521049debd22fa4e0
* | | | | | | am 9e2810bb: am 19340d21: Merge "Labeled categories to help clarify Sound ↵Daniel Sandler2010-04-212-0/+29
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prefs." into froyo Merge commit '9e2810bbed6a84b9e6de3464ec855f0b6c241ef1' into kraken * commit '9e2810bbed6a84b9e6de3464ec855f0b6c241ef1': Labeled categories to help clarify Sound prefs.
| * | | | | | am 19340d21: Merge "Labeled categories to help clarify Sound prefs." into froyoDaniel Sandler2010-04-212-0/+29
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '19340d213c4bd4428f940a12d82a494f9e7cfaa6' into froyo-plus-aosp * commit '19340d213c4bd4428f940a12d82a494f9e7cfaa6': Labeled categories to help clarify Sound prefs.
| | * | | | | Merge "Labeled categories to help clarify Sound prefs." into froyoDaniel Sandler2010-04-212-0/+29
| | |\ \ \ \ \ | | | |/ / / / | | | | / / / | | | |/ / / | | |/| | |
| | | * | | Labeled categories to help clarify Sound prefs.Daniel Sandler2010-04-212-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 2598014 Change-Id: Ia846367fc479345bfd02c10fe1860373719334eb
* | | | | | am 70631ab7: am 4c3b2f0c: Fix the tethering help page.Robert Greenwalt2010-04-211-3/+24
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '70631ab7146b149b1f221d59131fe4efe9d91ac0' into kraken * commit '70631ab7146b149b1f221d59131fe4efe9d91ac0': Fix the tethering help page.
| * | | | | am 4c3b2f0c: Fix the tethering help page.Robert Greenwalt2010-04-211-3/+24
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '4c3b2f0cf062b38a6e380cc15ff8dc9abdca518b' into froyo-plus-aosp * commit '4c3b2f0cf062b38a6e380cc15ff8dc9abdca518b': Fix the tethering help page.
generated by cgit v1.1 at 2024-09-17 21:06:58 +0000