Commit Graph

4802 Commits

Author SHA1 Message Date
Ben Komalo
35f18765f5 am abb06de8: Merge "Show factory reset option if encryption went bad."
* commit 'abb06de8ecfa151539ff130ed7a60038bef3bfd2':
  Show factory reset option if encryption went bad.
2011-09-07 15:31:01 -07:00
Ben Komalo
abb06de8ec Merge "Show factory reset option if encryption went bad." 2011-09-07 15:29:49 -07:00
Jake Hamby
e4e132766c am 04cf11c9: Merge "BT device picker: don\'t rescan after rotating the device"
* commit '04cf11c90bcbacd40766d714303f37780aaae357':
  BT device picker: don't rescan after rotating the device
2011-09-07 14:58:36 -07:00
Jake Hamby
04cf11c90b Merge "BT device picker: don't rescan after rotating the device" 2011-09-07 14:56:43 -07:00
Justin Ho
92da1db0c3 am 3badeb19: Merge "Updated Power Widget assets Bug: 5058574"
* commit '3badeb199fafaaaa93221762bd7f22b4538f5a84':
  Updated Power Widget assets Bug: 5058574
2011-09-07 14:10:24 -07:00
Justin Ho
3badeb199f Merge "Updated Power Widget assets Bug: 5058574" 2011-09-07 14:08:47 -07:00
Justin Ho
308c5caa0c Updated Power Widget assets
Bug: 5058574

Change-Id: Id236f3c33ced3232eccf7a19318d3e468933a1e3
2011-09-07 13:29:36 -07:00
Irfan Sheriff
aca84bccd3 am 01eaeb7a: Merge "Update settings from API cleanup"
* commit '01eaeb7a6aadc3782c6e404e20d174841e8f2ad9':
  Update settings from API cleanup
2011-09-07 11:30:16 -07:00
Irfan Sheriff
01eaeb7a6a Merge "Update settings from API cleanup" 2011-09-07 11:28:53 -07:00
Irfan Sheriff
6d55aaaaeb am 84fbf2b8: Merge "Use renamed Wps class"
* commit '84fbf2b8dde1650e5428883d37282f0506ac25a6':
  Use renamed Wps class
2011-09-07 10:56:01 -07:00
Irfan Sheriff
84fbf2b8dd Merge "Use renamed Wps class" 2011-09-07 10:53:56 -07:00
Irfan Sheriff
6b8de71381 Update settings from API cleanup
Bug: 5247957
Change-Id: Iba77318972b58f4fe250b9adfe83937c9cce7ef3
2011-09-07 00:10:51 -07:00
Irfan Sheriff
6689200262 Use renamed Wps class
Bug: 5247957
Change-Id: Ib95f0411f637bcb6d43b9b963a282d4e9c4e813a
2011-09-06 22:32:04 -07:00
Jake Hamby
de53b46b16 BT device picker: don't rescan after rotating the device
The Bluetooth device picker was restarting the device scan after
the screen is rotated. Fix this by only starting the scan when the
savedInstanceState Bundle passed to onCreate() is null.

Also removes "No Bluetooth devices were found nearby" from list if
the user switches to a different app and then switches back to
the device picker.

Bug: 5249380
Change-Id: I8959c850649eb713fb930ee0a8a7bcb73ca7c1aa
2011-09-06 18:35:08 -07:00
Ben Komalo
0e66609c95 Show factory reset option if encryption went bad.
Also update the wording for the error message

Bug: 3384231
Change-Id: I25a67cba7abede913bdd8cadaafc42bcbd5c5c5f
2011-09-06 17:45:15 -07:00
Justin Ho
ec39868cbb am 491af080: Merge "Update PowerWidget minWidth/minHeight so it reports as 4x1 We may update this value again"
* commit '491af0805dcf92185f1ee2767d11a933e8bb9053':
  Update PowerWidget minWidth/minHeight so it reports as 4x1 We may update this value again
2011-09-06 14:58:09 -07:00
Justin Ho
491af0805d Merge "Update PowerWidget minWidth/minHeight so it reports as 4x1 We may update this value again" 2011-09-06 14:56:07 -07:00
Justin Ho
39cd4e2e8e Update PowerWidget minWidth/minHeight so it reports as 4x1
We may update this value again

Bug: 5255991
Change-Id: I7297e6d4255dcb4925bc2fca67bdd75ae01ad1cc
2011-09-06 14:49:46 -07:00
Irfan Sheriff
78442f9b2d am c6680fd1: Merge "Provide help to turn off auto network disable"
* commit 'c6680fd1d490d7174e7e5bad4780186aff40214f':
  Provide help to turn off auto network disable
2011-09-06 12:10:56 -07:00
Irfan Sheriff
c6680fd1d4 Merge "Provide help to turn off auto network disable" 2011-09-06 12:08:03 -07:00
Eric Fischer
458bbdd108 am a54d1912: Merge "Import revised translations."
* commit 'a54d1912755fe96f76b18209448eb8b351d62711':
  Import revised translations.
2011-09-06 11:55:32 -07:00
Eric Fischer
a54d191275 Merge "Import revised translations." 2011-09-06 11:52:29 -07:00
Amith Yamasani
46c6bf7632 am 33198c7c: Merge "Avoid re-launching Keyguard warning dialog multiple times on orientation change."
* commit '33198c7ccbd13510ecc0e52ced7ad781e311642a':
  Avoid re-launching Keyguard warning dialog multiple times on orientation change.
2011-09-06 11:03:33 -07:00
Amith Yamasani
33198c7ccb Merge "Avoid re-launching Keyguard warning dialog multiple times on orientation change." 2011-09-06 11:02:12 -07:00
Irfan Sheriff
655900e028 Provide help to turn off auto network disable
When a user clicks on an network that is disabled due to poor
connection, add help information to let the user disable the feature

Bug: 5254937
Change-Id: Ia8ddaf9684ae21c9b4c1ab1edba6c941eb5272fd
2011-09-06 09:35:23 -07:00
satok
4f6c4c717a am ae70ee49: Sort subtypes in subtype enabler settings
* commit 'ae70ee49492bd89c949946562b43a75f3c81b0ad':
  Sort subtypes in subtype enabler settings
2011-09-06 01:26:05 -07:00
satok
ae70ee4949 Sort subtypes in subtype enabler settings
Bug: 3377334
Change-Id: Ie8dab8f6fb52610e783803cb902b032508d2b250
2011-09-06 17:16:32 +09:00
satok
3a573a4a79 am a849f9f7: Merge "Support automatic language"
* commit 'a849f9f74b69852643e4d13d9523f8af7e61d748':
  Support automatic language
2011-09-05 04:07:17 -07:00
satok
c9a8454f5b am 5efb531d: Tweak IME settings
* commit '5efb531d2dc0287c8c8fd954c3f46ea5550f3f7c':
  Tweak IME settings
2011-09-05 04:07:15 -07:00
satok
a849f9f74b Merge "Support automatic language" 2011-09-05 04:04:17 -07:00
satok
94bc76f1aa Support automatic language
Bug: 5057886

Change-Id: I7e18676622750c9b7299ab6a44856ad1aaca1b49
2011-09-05 19:53:26 +09:00
satok
5efb531d2d Tweak IME settings
Change-Id: I09bb9994737b29765ea7b13119ee2b9b3fb076cc
2011-09-05 19:16:06 +09:00
Gilles Debunne
e81d81ceca am bd8fc0c0: Merge "Part of Bug 5252423: Crash in summary text when time out is 0"
* commit 'bd8fc0c089265206abc1767e6e8da0b871a06ff3':
  Part of Bug 5252423: Crash in summary text when time out is 0
2011-09-02 17:11:17 -07:00
Gilles Debunne
bd8fc0c089 Merge "Part of Bug 5252423: Crash in summary text when time out is 0" 2011-09-02 17:10:03 -07:00
Jeff Sharkey
bb2a564c31 am 28130d96: Unify data/power layout, confirm disable, round.
* commit '28130d96385d7d7b17992b45fb5d124836d85880':
  Unify data/power layout, confirm disable, round.
2011-09-02 16:40:38 -07:00
Jeff Sharkey
28130d9638 Unify data/power layout, confirm disable, round.
Share consistent layout between data usage and battery usage.  Show
confirmation dialog before disabling mobile data.  Round warning/limit
sweep values to match displayed label.  Suppress fade when switching
data usage tabs.

Bug: 5208510, 5058157, 5038589, 5252816
Change-Id: I3c76f3397445d2d3b173666a41672871df4c61af
2011-09-02 16:15:25 -07:00
Gilles Debunne
698c24fcf0 Part of Bug 5252423: Crash in summary text when time out is 0
Negative value will show no summary.

Zero is no longer a special case. It will display the first summary, like any
value below it.

Change-Id: I88d49cac844fb2dc347bef94ac033df9255d748f
2011-09-02 15:47:26 -07:00
Eric Fischer
860931dca3 Import revised translations.
Change-Id: I240c28df3578d9b8b25271c39c231d1b3af4c4ac
2011-09-02 14:52:46 -07:00
Jean Chalard
dac1ef4005 am 4e658ba9: Fix an NPE
* commit '4e658ba969830e8c9617dc8938271df1ed09aa44':
  Fix an NPE
2011-09-02 08:12:22 -07:00
Jean Chalard
4e658ba969 Fix an NPE
It seems the user dictionary fragment does not tolerate being
called by name, and needs to be called only by action.

Bug: 5242122
Change-Id: I6b954db549b98d4d0076fdce8e00d336fc18b6e3
2011-09-02 21:44:12 +09:00
Irfan Sheriff
ffd2eafe1d am eb913af2: Merge "Remove device name and display debug setting"
* commit 'eb913af2a663dc1a0f7d758a041503d6adf1381c':
  Remove device name and display debug setting
2011-09-01 21:48:41 -07:00
Irfan Sheriff
eb913af2a6 Merge "Remove device name and display debug setting" 2011-09-01 21:46:43 -07:00
Ben Komalo
6a7b1ba95d am f3a3d04b: Merge "Fix order of buttons for device admin toggle"
* commit 'f3a3d04bba3441318d27db4e3845dc5ad44459d6':
  Fix order of buttons for device admin toggle
2011-09-01 16:54:49 -07:00
Ben Komalo
f3a3d04bba Merge "Fix order of buttons for device admin toggle" 2011-09-01 16:09:30 -07:00
Ben Komalo
1743c15749 Fix order of buttons for device admin toggle
Bug: 5156853
Change-Id: Ia70d5f42909d8983a0858ed67d32df12c049f420
2011-09-01 16:01:34 -07:00
Irfan Sheriff
e964d57152 Remove device name and display debug setting
Device name in WifiP2pConfig is going away

Bug: 5247957
Change-Id: Ib6ada8420ed8e7fbfcab85eee5f1665e33e8f024
2011-09-01 15:01:03 -07:00
Amith Yamasani
2f444f9039 am 1679b2c2: Merge "Ignore the volume hard keys in Volume settings screen."
* commit '1679b2c2e67f9accc58766a23ac852be762cff20':
  Ignore the volume hard keys in Volume settings screen.
2011-09-01 14:51:10 -07:00
Amith Yamasani
1679b2c2e6 Merge "Ignore the volume hard keys in Volume settings screen." 2011-09-01 14:49:08 -07:00
Amith Yamasani
e9d8ff9d4b am 9bc770b0: Merge "Use the same empty message for user dictionary on tablets and phones."
* commit '9bc770b0b750a6c9511e106c8b6580a81ca792e3':
  Use the same empty message for user dictionary on tablets and phones.
2011-09-01 14:49:08 -07:00
Amith Yamasani
9bc770b0b7 Merge "Use the same empty message for user dictionary on tablets and phones." 2011-09-01 14:48:15 -07:00