satok
927d42b715
am b9509d04
: Update the current IME label
...
* commit 'b9509d046c911b7b334aa45f693c49a7182ef470':
Update the current IME label
2011-09-12 04:22:16 -07:00
satok
b9509d046c
Update the current IME label
...
Bug: 5069983
Change-Id: I84d6ac7c39b5f3a035aa04c35065280a14024c47
2011-09-12 19:14:16 +09:00
Ben Komalo
d4758efef6
Don't try to talk to vold mid-encryption.
...
We were attempting to unconditionally validate the encryption state on
CryptKeeper bringup, which required MountService to talk to vold. For
some reason, during encryption, this cannot happen, and that call never
returns, so the CryptKeeper UI was never brought up.
Bug: 5276690
Change-Id: I6a146e25e24f4efd760b0afa1e1409bf9ea3e9c3
2011-09-11 17:16:27 -07:00
Ben Komalo
879ebe567c
am 782ed596
: Merge "Force storage wipe if not removable and encrypted"
...
* commit '782ed596ebb02245645466ae5972e06ce7daae9f':
Force storage wipe if not removable and encrypted
2011-09-11 16:52:40 -07:00
Ben Komalo
782ed596eb
Merge "Force storage wipe if not removable and encrypted"
2011-09-11 16:48:32 -07:00
Justin Ho
1b6bb2a60b
am f5533277
: Merge "Updated Settings launcher icon Bug: 5286988"
...
* commit 'f55332772c3f77dfd5bd861f6e5ccf49df0311bf':
Updated Settings launcher icon Bug: 5286988
2011-09-09 17:28:24 -07:00
Justin Ho
f55332772c
Merge "Updated Settings launcher icon Bug: 5286988"
2011-09-09 17:27:05 -07:00
Justin Ho
8ef621daef
Updated Settings launcher icon
...
Bug: 5286988
Change-Id: Iedd7b803c497a75b4b78589275cc16a5c7f32863
2011-09-09 16:36:25 -07:00
Peter Ng
218bd5f61b
am c2d655b8
: Merge "Power widget visual updates"
...
* commit 'c2d655b8277d71a99fda56e3180526c11a5783aa':
Power widget visual updates
2011-09-09 13:41:00 -07:00
Peter Ng
c2d655b827
Merge "Power widget visual updates"
2011-09-09 13:38:50 -07:00
Ben Komalo
2a32192329
Force storage wipe if not removable and encrypted
...
Bug: 5017638
Change-Id: I43c98359eff7202437249675060ba964e1bd085c
2011-09-09 12:40:38 -07:00
Jeff Sharkey
67a07aa372
am a3fb4572
: Merge "Larger touch targets, snap to persisted value."
...
* commit 'a3fb4572dd8dea59ceb3cbc8907fb71a92df4290':
Larger touch targets, snap to persisted value.
2011-09-09 11:29:00 -07:00
Jeff Sharkey
a3fb4572dd
Merge "Larger touch targets, snap to persisted value."
2011-09-09 11:27:24 -07:00
Justin Ho
70266457e2
am a83bb7c7
: Merge "Updated PowerWidget dimens Bug: 5278970"
...
* commit 'a83bb7c7f57d5c40a19ee3b603de7955f3021941':
Updated PowerWidget dimens Bug: 5278970
2011-09-09 11:04:23 -07:00
Justin Ho
a83bb7c7f5
Merge "Updated PowerWidget dimens Bug: 5278970"
2011-09-09 11:01:51 -07:00
Peter Ng
b2dca8fae1
Power widget visual updates
...
-light spill added
-padding top to make up for new shadow and light spill
Change-Id: I5d6bee6efd58736a812b9c3d144b8735d30865f5
2011-09-09 10:40:43 -07:00
Gilles Debunne
10d82f783b
am e5d61792
: Merge "Bug 5042999: Wi-Fi disconnect policy strings"
...
* commit 'e5d6179291276ed95cfc1d4a89e890d5fb4d04f7':
Bug 5042999: Wi-Fi disconnect policy strings
2011-09-09 09:49:05 -07:00
Gilles Debunne
e5d6179291
Merge "Bug 5042999: Wi-Fi disconnect policy strings"
2011-09-09 09:47:29 -07:00
Jean-Baptiste Queru
b7ba1b16af
am 3d5c990b
: Reconcile with gingerbread-release gingerbread-mr4-release
...
* commit '3d5c990b63678d2152481a31c58c9a0934a34540':
DO NOT MERGE Fix crash when device is null in Connection Access Cancel.
DO NOT MERGE Fix crash when device is null in Connection Access Cancel.
2011-09-09 09:07:32 -07:00
Jim Miller
61995c2325
am 5541a86e
: Fix 5185505: Add weak biometric sensors to security choices.
...
* commit '5541a86efe5f26956e54de49c4a59bf1dab79a78':
Fix 5185505: Add weak biometric sensors to security choices.
2011-09-09 09:07:00 -07:00
Amith Yamasani
1bf3b6868b
am a9ec5e50
: Merge "Move notification LED setting down to SYSTEM section."
...
* commit 'a9ec5e5071b1de7b86718e8a4e259ecfd57f8b96':
Move notification LED setting down to SYSTEM section.
2011-09-09 09:01:49 -07:00
Jean-Baptiste Queru
3d5c990b63
Reconcile with gingerbread-release gingerbread-mr4-release
...
Change-Id: I6e271c4fbcb138e695fb21c268df7d83efb5484f
2011-09-09 05:45:05 -07:00
Jim Miller
5541a86efe
Fix 5185505: Add weak biometric sensors to security choices.
...
This adds a simple biometric sensor (face lock) to the security choices.
Updated to disable biometric sensor by default.
Change-Id: I088e5e99cf5f8c7a06a1a992a9257940eb2cc07f
2011-09-08 23:47:47 -07:00
Jeff Sharkey
5d70679c02
Larger touch targets, snap to persisted value.
...
Extend ListView content to screen edges, and use InsetBoundsDrawable
to draw separator and divider with expected padding. Sweep touch
targets are now much larger.
Snap sweep to persisted value, and fix NFE when parsing label value.
Bug: 5274249
Bug: 5262865
Bug: 5242857
Change-Id: Ifa0f3e622767d5b4dc85a73d6340207e6038a429
2011-09-08 19:02:31 -07:00
Gilles Debunne
829c556645
Bug 5042999: Wi-Fi disconnect policy strings
...
Changed string.
Preference's summary now displays the currently selected value.
Change-Id: I5d867bb149c247809c6794f57d91dbebd96392f4
2011-09-08 16:51:39 -07:00
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
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