Wink Saville
289c2f0d30
Merge "Use MOBILE_PROVISIONING_ACTION for manage mobile plan." into jb-mr2-dev
2013-08-29 17:20:29 +00:00
Baligh Uddin
57b8416b4b
am da1f8abd: (-s ours) am f7b5ad80: (-s ours) am da7395d6: (-s ours) am c7902845: (-s ours) Import translations. DO NOT MERGE
...
* commit 'da1f8abda6fa4b1cd1018c7415ebcfbea8fa1f6f':
Import translations. DO NOT MERGE
2013-08-29 08:04:27 -07:00
Baligh Uddin
28939160e4
am 0aad9801: (-s ours) am 439b1543: (-s ours) am 17d0af91: (-s ours) Import translations. DO NOT MERGE
...
* commit '0aad9801705675c246fe548f687ed14359b53f78':
Import translations. DO NOT MERGE
2013-08-29 08:00:59 -07:00
Baligh Uddin
da1f8abda6
am f7b5ad80: (-s ours) am da7395d6: (-s ours) am c7902845: (-s ours) Import translations. DO NOT MERGE
...
* commit 'f7b5ad80a8e31d717ffed1a0b7a1403c3bf75cd1':
Import translations. DO NOT MERGE
2013-08-29 07:59:30 -07:00
Baligh Uddin
f7b5ad80a8
am da7395d6: (-s ours) am c7902845: (-s ours) Import translations. DO NOT MERGE
...
* commit 'da7395d6c5a92738c2e7130590f30a536ec94b54':
Import translations. DO NOT MERGE
2013-08-29 07:57:04 -07:00
Baligh Uddin
0aad980170
am 439b1543: (-s ours) am 17d0af91: (-s ours) Import translations. DO NOT MERGE
...
* commit '439b1543119fd97d134c602d92fc6ce9a517be20':
Import translations. DO NOT MERGE
2013-08-29 07:56:04 -07:00
Baligh Uddin
192296f0b9
am 02f3f202: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '02f3f2028fbd50ad39936e5b295d89039469fb7c':
Import translations. DO NOT MERGE
2013-08-29 07:54:22 -07:00
Baligh Uddin
da7395d6c5
am c7902845: (-s ours) Import translations. DO NOT MERGE
...
* commit 'c79028454106f4e73702c4bd4dde36a37beca90c':
Import translations. DO NOT MERGE
2013-08-29 07:53:56 -07:00
Baligh Uddin
439b154311
am 17d0af91: (-s ours) Import translations. DO NOT MERGE
...
* commit '17d0af9160697f0fcb2d33ed4b4e91ad6769141c':
Import translations. DO NOT MERGE
2013-08-29 07:53:47 -07:00
Baligh Uddin
02f3f2028f
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-08-29 14:50:25 +00:00
Baligh Uddin
7d84a4cb9c
Import translations. DO NOT MERGE
...
Change-Id: I778a192cc22364fde11327c0e5e0d92dce6ef965
Auto-generated-cl: translation import
2013-08-28 23:36:55 -07:00
Baligh Uddin
17d0af9160
Import translations. DO NOT MERGE
...
Change-Id: I2373253c983b6298e17d38882fc85ada1fd2e6e2
Auto-generated-cl: translation import
2013-08-28 23:33:19 -07:00
Baligh Uddin
c790284541
Import translations. DO NOT MERGE
...
Change-Id: I7e0a050642f956f175dcb349945089b4515c1bb5
Auto-generated-cl: translation import
2013-08-28 23:32:03 -07:00
Martijn Coenen
573a21ada2
Update NFC payments to match new framework APIs.
...
Bug: 10262585
Change-Id: Id4167db50f8e5fe145441bdf73d151a61a8587ed
2013-08-28 19:30:41 -07:00
Amith Yamasani
637d991e5e
am 6760f923: Merge "Fix RTL layout of text in Battery history screen" into klp-dev
...
* commit '6760f92321d2013676863b533606563ed2041648':
Fix RTL layout of text in Battery history screen
2013-08-28 18:07:51 -07:00
Amith Yamasani
6760f92321
Merge "Fix RTL layout of text in Battery history screen" into klp-dev
2013-08-29 01:04:11 +00:00
Lifu Tang
3d0bee59b8
Fixed the widget location toggle button
...
- Fix b/10531669
Change-Id: Iba08d515119c42e5c4de4ee02d6dd8aea404fc69
2013-08-28 17:01:43 -07:00
Lifu Tang
cc0a9be7c9
am dcf2509e: Merge "Disallows setting when user restriction applies" into klp-dev
...
* commit 'dcf2509e75059fcf3f34f82226597681107efb09':
Disallows setting when user restriction applies
2013-08-28 15:38:24 -07:00
Lifu Tang
dcf2509e75
Merge "Disallows setting when user restriction applies" into klp-dev
2013-08-28 22:29:55 +00:00
Amith Yamasani
74809c2679
Fix RTL layout of text in Battery history screen
...
Change the anchor position and alignment direction for text.
Bug: 10447666
Change-Id: Ida4161c738cf9a32cc8ff98037f3755046e64e33
2013-08-28 15:14:16 -07:00
Amith Yamasani
2c3fedd0ac
am 079c412d: Merge "Add more fragments to valid list for Wifi activity" into klp-dev
...
* commit '079c412def3472fc37750b7f778be3bb03114e38':
Add more fragments to valid list for Wifi activity
2013-08-28 14:54:34 -07:00
Amith Yamasani
079c412def
Merge "Add more fragments to valid list for Wifi activity" into klp-dev
2013-08-28 21:52:59 +00:00
Wink Saville
bb77bf22d5
Use MOBILE_PROVISIONING_ACTION for manage mobile plan.
...
Bug: 10328264
Change-Id: I3925004011bb1243793c4c1b963d923dc2b00cb5
2013-08-28 14:26:27 -07:00
Lifu Tang
4fb17c1c98
Disallows setting when user restriction applies
...
- Fix b/10116533
Change-Id: Ib171f9545c1651fb36c408decefa47b3d82ba3ab
2013-08-28 13:41:20 -07:00
Amith Yamasani
85654787eb
Add more fragments to valid list for Wifi activity
...
Bug: 10508371
Change-Id: Ic2d2128433ae26ea6750281b978781cb56b97036
2013-08-28 12:38:46 -07:00
Russell Brenner
e8a80b5db3
Support Holo Light theme for wifi during setup
...
Adds programmatic support for holo light theme, activated by setting
EXTRA_THEME to "holo_light". Light-themed graphics are still pending.
Bug: 10407819
Change-Id: I81b6bf3fdf7ca3ee72b0f921b8adf6d858415887
2013-08-28 09:44:36 -07:00
Baligh Uddin
3d0992d811
am 8df4caf1: (-s ours) am d866be38: (-s ours) am 1caeb5a1: (-s ours) am d8c9c146: (-s ours) Import translations. DO NOT MERGE
...
* commit '8df4caf168a793d7f17b31ba50e37479b0404022':
Import translations. DO NOT MERGE
2013-08-27 19:43:39 -07:00
Baligh Uddin
d304be6342
am 26a4b208: (-s ours) am 56fc8b77: (-s ours) am 04a25289: (-s ours) Import translations. DO NOT MERGE
...
* commit '26a4b208ef141b64e6cb629c4e7151e365f1c227':
Import translations. DO NOT MERGE
2013-08-27 19:43:37 -07:00
Baligh Uddin
8df4caf168
am d866be38: (-s ours) am 1caeb5a1: (-s ours) am d8c9c146: (-s ours) Import translations. DO NOT MERGE
...
* commit 'd866be382b330ae6c96dfe0de66f2426945b7730':
Import translations. DO NOT MERGE
2013-08-27 19:42:22 -07:00
Baligh Uddin
d866be382b
am 1caeb5a1: (-s ours) am d8c9c146: (-s ours) Import translations. DO NOT MERGE
...
* commit '1caeb5a11d4846c5db9741c914b1ba53b0af6dc9':
Import translations. DO NOT MERGE
2013-08-27 19:40:21 -07:00
Baligh Uddin
26a4b208ef
am 56fc8b77: (-s ours) am 04a25289: (-s ours) Import translations. DO NOT MERGE
...
* commit '56fc8b77643411ca8c43b0f3d178c3804de7093b':
Import translations. DO NOT MERGE
2013-08-27 19:39:03 -07:00
Baligh Uddin
56fc8b7764
am 04a25289: (-s ours) Import translations. DO NOT MERGE
...
* commit '04a252899bdd8a798d1a9c90c2ab45f9efdba5a8':
Import translations. DO NOT MERGE
2013-08-27 19:37:03 -07:00
Baligh Uddin
3c1f138b97
am f92ee425: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit 'f92ee42545af691b1aa032735009c89d09063a38':
Import translations. DO NOT MERGE
2013-08-27 19:36:55 -07:00
Baligh Uddin
1caeb5a11d
am d8c9c146: (-s ours) Import translations. DO NOT MERGE
...
* commit 'd8c9c146e79636f44808e2514e666f0966cc5596':
Import translations. DO NOT MERGE
2013-08-27 19:36:48 -07:00
Baligh Uddin
f92ee42545
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-08-28 02:34:25 +00:00
Maggie Benthall
b1755b37fc
am 9506d857: Merge "Fix NPE in SecuritySettings.onResume()" into klp-dev
...
* commit '9506d857cbc87a3dcedc8c3599f1d45ac6fe995e':
Fix NPE in SecuritySettings.onResume()
2013-08-27 17:03:31 -07:00
Maggie Benthall
9506d857cb
Merge "Fix NPE in SecuritySettings.onResume()" into klp-dev
2013-08-28 00:00:01 +00:00
Amith Yamasani
90f5d21d40
am cb6ba728: Merge "Don\'t list apps that are disabled by the system" into klp-dev
...
* commit 'cb6ba728c5f872bc66e3b8ac3682b350cb7501f0':
Don't list apps that are disabled by the system
2013-08-27 14:45:57 -07:00
Amith Yamasani
cb6ba728c5
Merge "Don't list apps that are disabled by the system" into klp-dev
2013-08-27 21:42:58 +00:00
Alan Viverette
5ea751e48f
Update captioning settings to match revised API
...
BUG: 10461210
Change-Id: I44d1fdeaead4357ff2591db6d9dda1c8a231103c
2013-08-27 11:11:00 -07:00
Tom O'Neill
ca51ca84f6
am 9066b914: Merge "Switch to new location mode API recommended by API council" into klp-dev
...
* commit '9066b9140c376cb1b66a3eee830d9dfa177c6056':
Switch to new location mode API recommended by API council
2013-08-27 08:51:04 -07:00
Tom O'Neill
9066b9140c
Merge "Switch to new location mode API recommended by API council" into klp-dev
2013-08-27 15:48:34 +00:00
Tom O'Neill
4d6aaf30ea
am 5d821bed: Merge "Adapt to SettingsInjectorService API changes" into klp-dev
...
* commit '5d821bedb1f065702b9920fe15a6f81bc19ba36b':
Adapt to SettingsInjectorService API changes
2013-08-27 07:42:52 -07:00
Tom O'Neill
5d821bedb1
Merge "Adapt to SettingsInjectorService API changes" into klp-dev
2013-08-27 14:38:07 +00:00
Alan Viverette
14983f099c
am 0f9a405f: Fix APN preference style
...
* commit '0f9a405fd58f8f5d30fbbe975e063e324d46a1f2':
Fix APN preference style
2013-08-26 15:05:38 -07:00
Tom O'Neill
0af71e25f3
am cbf589e7: Merge "Handle races caused by rapid settings changed broadcasts" into klp-dev
...
* commit 'cbf589e73cd8b9a62c413c804b698e489f44c403':
Handle races caused by rapid settings changed broadcasts
2013-08-26 15:03:54 -07:00
Jim Miller
ca43641787
am f6794f95: Merge "Add setting to disable keyguard widgets" into klp-dev
...
* commit 'f6794f95d19306e0f8a1edf02670d8dabd6daa5f':
Add setting to disable keyguard widgets
2013-08-26 15:03:23 -07:00
Amith Yamasani
23f4337ba4
am 2a570787: Merge "Fix incorrect comparison" into klp-dev
...
* commit '2a5707874b6ec39798421f77e0ccf38dbaa1e65f':
Fix incorrect comparison
2013-08-26 15:03:22 -07:00
Lifu Tang
2110efe50f
am 85dfc900: Merge "Allows multi-line message on small-screen devices" into klp-dev
...
* commit '85dfc9009fdad338cdda62cbcc549fde8479bdce':
Allows multi-line message on small-screen devices
2013-08-26 15:03:19 -07:00
Chong Zhang
41bfb63ff9
am 5114444e: Merge "wifi-display: add certification options" into klp-dev
...
* commit '5114444eca4e62f32cc85b9740dc0c66f87d5d99':
wifi-display: add certification options
2013-08-26 15:03:07 -07:00