Mike J. Chen
d0f8706ce2
Merge "Allows auto dismissing of bluetooth activation dialogs" into ics-aah
2011-09-08 16:35:00 -07:00
Justin Ho
adff5b0d07
Updated PowerWidget dimens
...
Bug: 5278970
Change-Id: I70386349ac47cc58230c1ec0d18220e7af99a6e6
2011-09-08 16:22:38 -07:00
Amith Yamasani
a9ec5e5071
Merge "Move notification LED setting down to SYSTEM section."
2011-09-08 15:23:27 -07:00
Mike J. Chen
51fbe6c722
Allows auto dismissing of bluetooth activation dialogs
...
Create a new overlay boolean that allows products (like Android@Home
ones that have no or minimal display) to not bring up the bluetooth
activation confirmation dialog.
Change-Id: I5c49ae7202366fb83de9a6ebadd0c53406fd41cc
Signed-off-by: Mike J. Chen <mjchen@google.com >
2011-09-08 15:17:21 -07:00
Amith Yamasani
c65bdfc362
Move notification LED setting down to SYSTEM section.
...
Bug: 5242350
Change-Id: I4dbefc4e7ba5a19e873c00ba1da84e7a900226cf
2011-09-08 13:46:10 -07:00
Claudia de Veaux
dd81e1223e
am 14ca9f37: Merge "Shortened the "Restrict background data" string so it won\'t trucate. Bug: 5255012"
...
* commit '14ca9f371a8388bbcc1ceb8d7676eb3a85c7ded5':
Shortened the "Restrict background data" string so it won't trucate. Bug: 5255012
2011-09-08 10:44:25 -07:00
Dianne Hackborn
aed88f6ebb
am 4bed01d8: Fix an issue in how running services are shown.
...
* commit '4bed01d8727b106a1a6bd09a1d82309e1b0df040':
Fix an issue in how running services are shown.
2011-09-08 10:42:07 -07:00
Claudia de Veaux
14ca9f371a
Merge "Shortened the "Restrict background data" string so it won't trucate. Bug: 5255012"
2011-09-08 10:41:37 -07:00
The Android Automerger
9acfffc0e6
merge in ics-release history after reset to master
2011-09-08 06:34:54 -07:00
Dianne Hackborn
4bed01d872
Fix an issue in how running services are shown.
...
If a process had started services, but another process was
using it for more important reasons, it would still be shown
as just with running services. Now it will be bundled into
the other process that has a dependency on this.
This fixes an issue where something like a live wallpaper
that say sits forever with a connection to market's licensing
service would not show up to the user as using far more memory
than it should because it is keeping market running (if market
also leaves one of its services running, which it tends to do).
Change-Id: I0fd953b7221f7a3b35400007bb9e8437f09d066e
2011-09-07 18:47:36 -07:00
Jaikumar Ganesh
8997fe90bb
am 9b9db3f9: Merge "Enforce permissions for connection dialog intents."
...
* commit '9b9db3f966c86befa424b497266cb3493ac24977':
Enforce permissions for connection dialog intents.
2011-09-07 18:25:26 -07:00
Jaikumar Ganesh
9b9db3f966
Merge "Enforce permissions for connection dialog intents."
2011-09-07 18:22:35 -07:00
Jaikumar Ganesh
e0b01ade75
Enforce permissions for connection dialog intents.
...
Change-Id: I93bcf676f4bd11737f22f0b89cfe49c978a42c8e
2011-09-07 17:19:19 -07:00
Irfan Sheriff
876b29e93d
am c0cf46ca: Merge "Use hasSystemFeature() to check for p2p"
...
* commit 'c0cf46caa84217638f99b27777ddfb9b272e4e70':
Use hasSystemFeature() to check for p2p
2011-09-07 17:09:30 -07:00
Irfan Sheriff
c0cf46caa8
Merge "Use hasSystemFeature() to check for p2p"
2011-09-07 17:07:58 -07:00
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
Irfan Sheriff
167d7186a7
Use hasSystemFeature() to check for p2p
...
Bug: 5267396
Change-Id: I55cc85745dff5de43f73ec260b82ad100e237555
2011-09-07 14:51:11 -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
Claudia de Veaux
b8d6a8f9e7
Shortened the "Restrict background data" string so it won't trucate.
...
Bug: 5255012
Change-Id: Id8d403952330c56ffdb263ebf8cfce3036864678
Added char limit to string comment.
2011-09-07 12:58:06 -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
Alan Viverette
65081e6894
Fixed tutorial to read instructions after hover events.
...
Change-Id: I64476ac8c935b6ae7ece41dd714b76cc46f94361
2011-09-07 11:20:10 -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
The Android Automerger
a95f1a5152
merge in ics-release history after reset to master
2011-09-07 06:34: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
00c4de44f6
Update PowerWidget minWidth/minHeight so it reports as 4x1
...
We may update this value again
Bug: 5255991
Change-Id: I7297e6d4255dcb4925bc2fca67bdd75ae01ad1cc
2011-09-06 17:23:16 -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
The Android Automerger
8468a6ae94
merge in ics-release history after reset to master
2011-09-06 06:34:28 -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
The Android Automerger
3de977d964
merge in ics-release history after reset to master
2011-09-05 06:35:26 -07:00
satok
3a573a4a79
am a849f9f7: Merge "Support automatic language"
...
* commit 'a849f9f74b69852643e4d13d9523f8af7e61d748':
Support automatic language
2011-09-05 04:07:17 -07:00