Rob Tsuk
90a51e2bf9
am e57248e5
: Merge "Replace blue pressed feedback with gray." into klp-dev
...
* commit 'e57248e5f63172a5c78184ff9c885c823cb1dae8':
Replace blue pressed feedback with gray.
2013-09-25 13:55:04 -07:00
Rob Tsuk
e57248e5f6
Merge "Replace blue pressed feedback with gray." into klp-dev
2013-09-25 20:52:04 +00:00
Rob Tsuk
1fa7880c86
Replace blue pressed feedback with gray.
...
Change-Id: I03d5fbcd05975792dc27160d8ea44abdc1894624
2013-09-25 13:16:59 -07:00
Baligh Uddin
c2314e3229
am 083e6cc0
: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '083e6cc01276ab4feb9bb060d4f830cddbccff69':
Import translations. DO NOT MERGE
2013-09-25 13:01:48 -07:00
Baligh Uddin
083e6cc012
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-09-25 19:58:58 +00:00
Brian Carlstrom
594ffa25b0
am 372b6f74
: Enable runtime selection for art for user builds
...
* commit '372b6f74b17fe1ef207bcda511dd71a93f792682':
Enable runtime selection for art for user builds
2013-09-25 11:28:35 -07:00
Brian Carlstrom
372b6f74b1
Enable runtime selection for art for user builds
...
Bug: 10069754
Change-Id: I4b9780b52d3aac900e5d4da629e3e6b22c3cb323
2013-09-25 11:22:19 -07:00
Dave Burke
f3a0ce28ba
am 64b28a0d
: Disable AppOps for real.
...
* commit '64b28a0dcc174827e551f4c7e71e4268bd0f5bba':
Disable AppOps for real.
2013-09-25 10:35:03 -07:00
Dave Burke
64b28a0dcc
Disable AppOps for real.
...
Change-Id: I1a952dfd2b32566c2f64367dd9698a94410ec7c1
2013-09-25 09:56:58 -07:00
Baligh Uddin
a4d1b88707
Import translations. DO NOT MERGE
...
Change-Id: Id3d24fbbdc9140e85e5b5831a03b474641d3e871
Auto-generated-cl: translation import
2013-09-25 09:55:18 -07:00
Edward Jee
1146695e4b
am 5ad8bf07
: Merge "Once the user allows PBAP phonebook access, do not ask again." into klp-dev
...
* commit '5ad8bf0700cf3297773617e14456d82bbc8f9585':
Once the user allows PBAP phonebook access, do not ask again.
2013-09-24 15:26:23 -07:00
Edward Jee
5ad8bf0700
Merge "Once the user allows PBAP phonebook access, do not ask again." into klp-dev
2013-09-24 22:23:26 +00:00
Amith Yamasani
7dcd20f9a6
resolved conflicts for merge of 162b014c
to klp-dev-plus-aosp
...
Change-Id: I46175a9fa7775e7b53a5c4e149c7fd6247c5de9b
2013-09-24 14:59:11 -07:00
Amith Yamasani
162b014cea
Merge "Add Jakarta timezone" into klp-dev
2013-09-24 21:49:54 +00:00
Baligh Uddin
786f7eca41
am 0865ffb3
: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '0865ffb32d84cdd26bf5136d496b129efbdfc4f1':
Import translations. DO NOT MERGE
2013-09-24 14:30:17 -07:00
Baligh Uddin
0865ffb32d
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-09-24 21:27:51 +00:00
Christopher Tate
c268bf379b
am 254975aa
: Merge "Use a generic icon for Home" into klp-dev
...
* commit '254975aac1e42997c2e068a623e7221470525ee1':
Use a generic icon for Home
2013-09-24 11:46:11 -07:00
Christopher Tate
254975aac1
Merge "Use a generic icon for Home" into klp-dev
2013-09-24 18:44:14 +00:00
David Christie
820816e02c
am 4fff3d9b
: Merge "Don\'t show background apps in Settings->Location (b/10806272)" into klp-dev
...
* commit '4fff3d9b9d3677383fe1eef9c067058a92fdc5b7':
Don't show background apps in Settings->Location (b/10806272)
2013-09-23 19:00:49 -07:00
Dianne Hackborn
6be9bffa6f
am 88cf7709
: Implement issue #10895990 : Better durations for proc stats
...
* commit '88cf7709cb7ed829980cb8ddac3d5c7ac945d772':
Implement issue #10895990 : Better durations for proc stats
2013-09-23 19:00:12 -07:00
Jeff Sharkey
d572a03ad8
Use a generic icon for Home
...
It's only a *foolish* consistency that is the hobgoblin of
little minds.
Bug 10849877
Change-Id: Ice60cbb13a754edc104ae8630cb3d8dfe637d1af
2013-09-23 17:48:37 -07:00
David Christie
4fff3d9b9d
Merge "Don't show background apps in Settings->Location (b/10806272)" into klp-dev
2013-09-24 00:18:39 +00:00
Sungmin Choi
d3b9dc6356
Add Jakarta timezone
...
Bug: 10198358
Change-Id: Id35bf1f3e137587016649815d879052d9f8409d9
2013-09-23 16:10:03 -07:00
David Christie
b1e381be21
Don't show background apps in Settings->Location (b/10806272)
...
Change-Id: I7ed0249bbc4509e4116dfc88181faccde60365e1
2013-09-23 15:52:24 -07:00
Edward Jee
46c746551f
Once the user allows PBAP phonebook access, do not ask again.
...
Bug: 9876209
Change-Id: I8d9dcfa03e8d85577af4c4664fa34b3830e3d8f6
2013-09-23 15:21:27 -07:00
Dianne Hackborn
88cf7709cb
Implement issue #10895990 : Better durations for proc stats
...
Add new option to select data duration to show, with the default
being 3 hours.
Reworked how menus are updated to remove redundant code.
Switch to using new proc stats service API for retrieving stats,
which is more efficient and won't hit IPC limits.
Fixed layout for details items to ellipsize long items.
Change-Id: I1a0f8a4adf8fc330c2639077323c6379d23ad987
2013-09-23 15:02:13 -07:00
Baligh Uddin
d026526176
Import translations. DO NOT MERGE
...
Change-Id: I82e5be54e4bfd32b13af0cc450c9b3e7f2e66baa
Auto-generated-cl: translation import
2013-09-23 13:43:27 -07:00
David Christie
133233780b
am 1efb1b52
: Merge "Remove "Android System" from recent apps list in Settings (b/10855277)" into klp-dev
...
* commit '1efb1b52d6901ca58104030e3b98512473bed7fb':
Remove "Android System" from recent apps list in Settings (b/10855277)
2013-09-21 09:35:41 -07:00
David Christie
1efb1b52d6
Merge "Remove "Android System" from recent apps list in Settings (b/10855277)" into klp-dev
2013-09-21 16:33:51 +00:00
Svetoslav
a771964fe6
am 995e69d1
: Merge "Offer to enable a print service after it is installed (Settings)." into klp-dev
...
* commit '995e69d1e130d54b371e4278e90d508e025de9a2':
Offer to enable a print service after it is installed (Settings).
2013-09-20 18:18:32 -07:00
Svetoslav
995e69d1e1
Merge "Offer to enable a print service after it is installed (Settings)." into klp-dev
2013-09-21 01:15:52 +00:00
David Christie
bec860d6c4
Remove "Android System" from recent apps list in Settings (b/10855277)
...
Change-Id: I22d74c22c482786298af088abb7b25c790fd4b21
2013-09-20 18:08:54 -07:00
Svetoslav
0ad40283bb
Offer to enable a print service after it is installed (Settings).
...
The user has to explicitly enable a print service from the settings UI
before using it. Usually, users very rarely if at all interact with print
services, therefore all print service management task are performed from
the print settings. We also have to get user consent warning that the
user's data is about to be given to a third-party app. We now post a
notification allowing the user to go directly to the settings screen to
turn the service on.
bug:10447510
Change-Id: Ibfb5368a09b1e012dd6dd0f3d33a5ad10e5ee00e
2013-09-20 17:34:34 -07:00
Lifu Tang
1950047a32
am c9ebf9bb
: Merge "Change "Device sensors only" to "Device sensors"" into klp-dev
...
* commit 'c9ebf9bbad2eec84a68799a71a229d3198b49c73':
Change "Device sensors only" to "Device sensors"
2013-09-20 17:12:11 -07:00
Lifu Tang
c9ebf9bbad
Merge "Change "Device sensors only" to "Device sensors"" into klp-dev
2013-09-21 00:10:11 +00:00
Lifu Tang
db4ee54975
Change "Device sensors only" to "Device sensors"
...
- Fix b/10856635
Change-Id: I52ef1daacc205c50056fcead0e6b07c8674275f0
2013-09-20 16:57:18 -07:00
David Braun
41b18f71b2
am 1a2bfad4
: Merge "Fix crash rotating with default SMS dialog up." into klp-dev
...
* commit '1a2bfad4250cb231d60823affbb8288b6c6d1797':
Fix crash rotating with default SMS dialog up.
2013-09-20 16:31:23 -07:00
David Braun
1a2bfad425
Merge "Fix crash rotating with default SMS dialog up." into klp-dev
2013-09-20 23:29:41 +00:00
David Braun
be1f0a111e
Fix crash rotating with default SMS dialog up.
...
Bug: 10845396 NPE storage == null when user rotates device while setting up 'Default SMS app'
Change-Id: I9a19ede726caabe5e66b83951585380768b66be6
2013-09-20 14:15:32 -07:00
Elliott Hughes
b3bc933716
am aeb1fa77
: am 10fdcab4
: Merge "Fix time zone formatting in RTL locales."
...
* commit 'aeb1fa779ba781fc1decb68db387ee64df58befa':
Fix time zone formatting in RTL locales.
2013-09-20 13:47:58 -07:00
Elliott Hughes
aeb1fa779b
am 10fdcab4
: Merge "Fix time zone formatting in RTL locales."
...
* commit '10fdcab4245ce1beeb75c36b36ccaa48bf8953f0':
Fix time zone formatting in RTL locales.
2013-09-20 13:46:04 -07:00
Elliott Hughes
10fdcab424
Merge "Fix time zone formatting in RTL locales."
2013-09-20 20:44:32 +00:00
Jim Miller
2b130d786d
am de105da5
: Merge "Change string documentation for widget setting to be more clear." into klp-dev
...
* commit 'de105da5500477d216d226cc342811e335f8bcb4':
Change string documentation for widget setting to be more clear.
2013-09-20 13:06:38 -07:00
Jim Miller
de105da550
Merge "Change string documentation for widget setting to be more clear." into klp-dev
2013-09-20 20:03:52 +00:00
Jim Miller
7c41e5ec10
Change string documentation for widget setting to be more clear.
...
Fixes bug 10505288
Change-Id: I6a375c710b77db845073fffa6ebf15c1cd262900
2013-09-20 13:01:20 -07:00
Chong Zhang
a9d1d90c52
am d8f4eb50
: Merge "wifi-display: mark certification strings as not tranlatable" into klp-dev
...
* commit 'd8f4eb50ba8efb4e38c41e00ef1a176b99cdda33':
wifi-display: mark certification strings as not tranlatable
2013-09-20 10:25:49 -07:00
Chong Zhang
d8f4eb50ba
Merge "wifi-display: mark certification strings as not tranlatable" into klp-dev
2013-09-20 17:23:06 +00:00
Chong Zhang
6c0645b954
wifi-display: mark certification strings as not tranlatable
...
Bug: 10507614
Change-Id: I96557f48cb25bc767a3b4c7620a2312417018119
2013-09-19 18:24:32 -07:00
Christopher Tate
bc016eec42
am 8243c9a7
: Incorporate home metadata into app details UI
...
* commit '8243c9a722e815bdcb069163de48877478c28dfd':
Incorporate home metadata into app details UI
2013-09-19 17:59:06 -07:00
Christopher Tate
8243c9a722
Incorporate home metadata into app details UI
...
Just as we don't expose disable/uninstall of home applications in this UI,
we now also don't allow disable/uninstall of packages that are proxying
for home apps via the android.app.home.alternate meta-data mechanism.
Also, don't display the 'Home' settings top-level category at all when
there is only a single available home app.
Finally, explicitly note the current user when sending broadcasts,
otherwise API sanity checks get suspicious.
Bug 10749961
Change-Id: I13e11032cb571df19798c4e13c91a572d1ee61a7
2013-09-19 15:39:42 -07:00