OSDN Git Service
Svetoslav Ganov [Thu, 5 Sep 2013 21:41:35 +0000 (14:41 -0700)]
am
10cbbc55: Merge "Print settings polish" into klp-dev
* commit '
10cbbc5515a30dfa347f0a7b816ebde8cbb0e0f7':
Print settings polish
Svetoslav Ganov [Thu, 5 Sep 2013 21:38:11 +0000 (21:38 +0000)]
Merge "Print settings polish" into klp-dev
Przemyslaw Szczepaniak [Thu, 5 Sep 2013 13:26:44 +0000 (06:26 -0700)]
am
80c2b9b0: Hide "Play TTS sample" when locale is not settable as default
* commit '
80c2b9b0c4c03c5ae9459875c05bc7370b7d6ca0':
Hide "Play TTS sample" when locale is not settable as default
Przemyslaw Szczepaniak [Thu, 5 Sep 2013 12:05:04 +0000 (13:05 +0100)]
Hide "Play TTS sample" when locale is not settable as default
Due to a bug, it's possible for settings to show status telling
that locale is available, despite locale not being in list of
locales settable as TTS default locale. This change fixes it.
Bug:
10630713
Change-Id: I21f8487fc6c1ea7812aeffbc26dfa5fc0a8afa3b
Svetoslav Ganov [Thu, 5 Sep 2013 06:52:28 +0000 (23:52 -0700)]
Print settings polish
1. Added support for launching the top level print settings.
2. Updated some strings.
3. Removed the uninstall option for a print service.
4. Added search for the list of printers of a print service.
Change-Id: I9e175ba78b2d22b2bf90cf79153dc73327dfaff1
Dianne Hackborn [Thu, 5 Sep 2013 01:31:29 +0000 (18:31 -0700)]
am
dd600b60: Merge "Add details screen to proc stats." into klp-dev
* commit '
dd600b603d98e28219a9a38a62f2527db05736bb':
Add details screen to proc stats.
Dianne Hackborn [Thu, 5 Sep 2013 01:26:41 +0000 (01:26 +0000)]
Merge "Add details screen to proc stats." into klp-dev
Dianne Hackborn [Wed, 4 Sep 2013 22:47:59 +0000 (15:47 -0700)]
Add details screen to proc stats.
Lets you see the actual RAM use and % running time, a list of
all of the services that are associated with it (kind-of, not
working correctly for those that share processes), and most
importantly a glorious FORCE STOP button.
Change-Id: I34ac30c88f1187227a8a7809ae103118c8b9a865
Svetoslav [Thu, 5 Sep 2013 00:20:45 +0000 (17:20 -0700)]
am
f7092bc6: Merge "Implementing print settings as per UX spec." into klp-dev
* commit '
f7092bc6bfb16695d73f984d3c2cf557c63a17f1':
Implementing print settings as per UX spec.
Svetoslav [Thu, 5 Sep 2013 00:18:48 +0000 (00:18 +0000)]
Merge "Implementing print settings as per UX spec." into klp-dev
Chong Zhang [Wed, 4 Sep 2013 22:11:34 +0000 (15:11 -0700)]
am
35ec3b7f: Merge "wifi-display: add drop down list for Wps config method" into klp-dev
* commit '
35ec3b7fa389e9a2ddc131eb3a75b2f3dbc8330e':
wifi-display: add drop down list for Wps config method
Chong Zhang [Wed, 4 Sep 2013 22:07:18 +0000 (22:07 +0000)]
Merge "wifi-display: add drop down list for Wps config method" into klp-dev
Svetoslav [Wed, 4 Sep 2013 04:32:40 +0000 (21:32 -0700)]
Implementing print settings as per UX spec.
Change-Id: Iafe99a1e959472f893cf168d952d9dd19ff160c0
Tom O'Neill [Wed, 4 Sep 2013 14:22:29 +0000 (07:22 -0700)]
am
97df9822: Merge "Switch to receiving LocationManager.MODE_CHANGED_ACTION" into klp-dev
* commit '
97df982296244cc067c281b97ff2a6ade2a8ca31':
Switch to receiving LocationManager.MODE_CHANGED_ACTION
Tom O'Neill [Wed, 4 Sep 2013 14:20:03 +0000 (14:20 +0000)]
Merge "Switch to receiving LocationManager.MODE_CHANGED_ACTION" into klp-dev
Baligh Uddin [Wed, 4 Sep 2013 05:02:40 +0000 (22:02 -0700)]
am
c63e097a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
c63e097aa7b6200f78714da892ef6a3fe0bd4aba':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 4 Sep 2013 05:00:08 +0000 (05:00 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Amith Yamasani [Wed, 4 Sep 2013 01:00:17 +0000 (18:00 -0700)]
am
9b444f78: Merge "Pass correct user id for the extra" into klp-dev
* commit '
9b444f78f14384b59b01f966b044bb23c6af4982':
Pass correct user id for the extra
Amith Yamasani [Wed, 4 Sep 2013 00:55:18 +0000 (00:55 +0000)]
Merge "Pass correct user id for the extra" into klp-dev
Amith Yamasani [Wed, 4 Sep 2013 00:44:49 +0000 (17:44 -0700)]
Pass correct user id for the extra
This was causing PrintManagerService to get a broadcast with an incorrect
userid and ended up crashing the SettingsProvider.
Bug:
10608503
Change-Id: I4693de181ddfa599d685ac9bd16ac15cea8b2e52
Geoffrey Borggaard [Wed, 4 Sep 2013 00:43:51 +0000 (17:43 -0700)]
am
af6cdb2b: Merge "Pin protect going into developer mode." into klp-dev
* commit '
af6cdb2b30a875b0a563196bb5c405b080b3cbe0':
Pin protect going into developer mode.
Geoffrey Borggaard [Wed, 4 Sep 2013 00:41:50 +0000 (00:41 +0000)]
Merge "Pin protect going into developer mode." into klp-dev
Lifu Tang [Wed, 4 Sep 2013 00:16:14 +0000 (17:16 -0700)]
am
f4c4294c: Merge "Renamed "Location services" to "App settings"" into klp-dev
* commit '
f4c4294c502d774c1c56d6b2dca56a604cc85f87':
Renamed "Location services" to "App settings"
Lifu Tang [Wed, 4 Sep 2013 00:13:09 +0000 (00:13 +0000)]
Merge "Renamed "Location services" to "App settings"" into klp-dev
Vineeta Srivastava [Tue, 3 Sep 2013 23:52:51 +0000 (16:52 -0700)]
am
58db3418: Merge "Show regulatory info based on hardware sku in Settings app." into klp-dev
* commit '
58db341851a0858339f83b432807e6ed87ca9fe5':
Show regulatory info based on hardware sku in Settings app.
Vineeta Srivastava [Tue, 3 Sep 2013 23:48:34 +0000 (23:48 +0000)]
Merge "Show regulatory info based on hardware sku in Settings app." into klp-dev
Lifu Tang [Tue, 3 Sep 2013 23:36:56 +0000 (16:36 -0700)]
Renamed "Location services" to "App settings"
- Fix b/
10610559
Change-Id: I7f7167fb45ebeb045b4c0095448de0134a551eec
Lifu Tang [Tue, 3 Sep 2013 21:29:13 +0000 (14:29 -0700)]
am
b3cd38ea: Merge "Fixed the crash on screen rotation" into klp-dev
* commit '
b3cd38eab4402a95e779d4d0b92480b7c53fa473':
Fixed the crash on screen rotation
Lifu Tang [Tue, 3 Sep 2013 21:26:33 +0000 (21:26 +0000)]
Merge "Fixed the crash on screen rotation" into klp-dev
Baligh Uddin [Tue, 3 Sep 2013 21:01:35 +0000 (14:01 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2a10a77eb978fae7a97c25de71007605a4e20248
Auto-generated-cl: translation import
Lifu Tang [Tue, 3 Sep 2013 20:47:02 +0000 (13:47 -0700)]
Fixed the crash on screen rotation
- Fix b/
10607566
Change-Id: I078e59af2a76deb272b870d7708ee4148c68590e
Russell Brenner [Tue, 3 Sep 2013 20:32:00 +0000 (13:32 -0700)]
am
69a50431: Merge changes Ie232b2d4,I81b6bf3f into klp-dev
* commit '
69a5043130ae0bb01d7b2608aac340b7abc0c590':
Add resources for light theme
Support Holo Light theme for wifi during setup
Tom O'Neill [Tue, 3 Sep 2013 20:32:00 +0000 (13:32 -0700)]
am
81eae57f: Merge "Adapt to renaming of SettingInjectorService API constants" into klp-dev
* commit '
81eae57f2c16e9f2934cfdf887e8f4832f703f4a':
Adapt to renaming of SettingInjectorService API constants
Russell Brenner [Tue, 3 Sep 2013 20:26:42 +0000 (20:26 +0000)]
Merge changes Ie232b2d4,I81b6bf3f into klp-dev
* changes:
Add resources for light theme
Support Holo Light theme for wifi during setup
Tom O'Neill [Tue, 3 Sep 2013 20:26:09 +0000 (20:26 +0000)]
Merge "Adapt to renaming of SettingInjectorService API constants" into klp-dev
Vineeta Srivastava [Thu, 29 Aug 2013 00:17:57 +0000 (17:17 -0700)]
Show regulatory info based on hardware sku in Settings app.
Use ro.boot.hardware.sku to read hardware sku property. When this property is
set use regulatory_info_<sku>.img. By default use regulatory_info.png
Updated layout to set ImageView.
Bug:
9378140
Change-Id: I8e3622a89742333818297759585227c6290ccf31
Lifu Tang [Tue, 3 Sep 2013 17:57:30 +0000 (10:57 -0700)]
am
7e2227fc: Merge "Ignores AppOps entries belonging to other users" into klp-dev
* commit '
7e2227fc657cf22f39a5db4741e6ab46b20c0dc2':
Ignores AppOps entries belonging to other users
Lifu Tang [Tue, 3 Sep 2013 17:55:48 +0000 (17:55 +0000)]
Merge "Ignores AppOps entries belonging to other users" into klp-dev
Martijn Coenen [Tue, 3 Sep 2013 17:28:28 +0000 (10:28 -0700)]
am
ec8f11da: Merge "NFC Tap&Pay: deal with changes from API review." into klp-dev
* commit '
ec8f11da8fb7b5f698e2861311e1291f6f5770f9':
NFC Tap&Pay: deal with changes from API review.
Martijn Coenen [Tue, 3 Sep 2013 17:25:15 +0000 (17:25 +0000)]
Merge "NFC Tap&Pay: deal with changes from API review." into klp-dev
Lifu Tang [Tue, 3 Sep 2013 17:09:16 +0000 (10:09 -0700)]
am
06659c5a: Merge "Creates Sipper even the consumption is very little" into klp-dev
* commit '
06659c5a55c8ad5b7b640d23ed03fa2a8cbbab49':
Creates Sipper even the consumption is very little
Lifu Tang [Tue, 3 Sep 2013 17:09:15 +0000 (10:09 -0700)]
am
47aab2ee: Merge "Shows correct state when location sharing disabled" into klp-dev
* commit '
47aab2eed7263e9593f1e866672f73ec30c7bc17':
Shows correct state when location sharing disabled
Lifu Tang [Fri, 30 Aug 2013 23:02:16 +0000 (16:02 -0700)]
Ignores AppOps entries belonging to other users
- Fix b/
10567352
Change-Id: I6aac030a426e5a881578b518a9cf6bad8679d087
Lifu Tang [Tue, 3 Sep 2013 17:01:56 +0000 (17:01 +0000)]
Merge "Creates Sipper even the consumption is very little" into klp-dev
Lifu Tang [Tue, 3 Sep 2013 17:01:33 +0000 (17:01 +0000)]
Merge "Shows correct state when location sharing disabled" into klp-dev
Amith Yamasani [Tue, 3 Sep 2013 16:00:33 +0000 (09:00 -0700)]
am
a2aaf0e6: Merge "Add a missing fragment to list of valid ones for top-level settings" into klp-dev
* commit '
a2aaf0e60fcbfc5b6eaac06e9663e2af0bc82c7c':
Add a missing fragment to list of valid ones for top-level settings
Amith Yamasani [Tue, 3 Sep 2013 15:57:24 +0000 (15:57 +0000)]
Merge "Add a missing fragment to list of valid ones for top-level settings" into klp-dev
Lifu Tang [Sat, 31 Aug 2013 01:03:43 +0000 (18:03 -0700)]
Creates Sipper even the consumption is very little
Change-Id: I9682f262a481f3586760b8464b96eeb22814a840
Tom O'Neill [Tue, 3 Sep 2013 14:56:53 +0000 (07:56 -0700)]
Switch to receiving LocationManager.MODE_CHANGED_ACTION
- From LocationManager.PROVIDERS_CHANGED
- Part of fix for b/
10409275
Change-Id: I4030c8df4db942777d6035266a8ed7f18e458fb5
Wink Saville [Sat, 31 Aug 2013 00:29:15 +0000 (17:29 -0700)]
am
a2904f9d: am
d5c71fc4: am
e38165ca: am
7bee4c29: Use correct action string for provisioning.
* commit '
a2904f9d5091ef5055d97adf72d32e8c19551c8e':
Use correct action string for provisioning.
Wink Saville [Sat, 31 Aug 2013 00:26:19 +0000 (17:26 -0700)]
am
d5c71fc4: am
e38165ca: am
7bee4c29: Use correct action string for provisioning.
* commit '
d5c71fc4e613d80d1ff8c128f29d9c201bcb3f90':
Use correct action string for provisioning.
Lifu Tang [Fri, 30 Aug 2013 01:06:30 +0000 (18:06 -0700)]
Shows correct state when location sharing disabled
- Fix b/
10553306
Change-Id: I01f69aaeb79e18ddf29da5aef7ea00938e674429
Amith Yamasani [Fri, 30 Aug 2013 22:43:44 +0000 (15:43 -0700)]
Add a missing fragment to list of valid ones for top-level settings
Bug:
10552817
Change-Id: I1ea80de565d1ec58da834cdd67dab0cb71e635b7
Alan Viverette [Fri, 30 Aug 2013 21:38:21 +0000 (14:38 -0700)]
am
6dde146d: Merge "Update captioning settings to match revised API" into klp-dev
* commit '
6dde146df030dfada1a9e112621e97424a2b6e3c':
Update captioning settings to match revised API
Alan Viverette [Fri, 30 Aug 2013 21:35:04 +0000 (21:35 +0000)]
Merge "Update captioning settings to match revised API" into klp-dev
Geoffrey Borggaard [Fri, 30 Aug 2013 20:07:20 +0000 (16:07 -0400)]
Pin protect going into developer mode.
Developer mode turns on ADB which we definately don't want students to do.
Bug:
10549646
Change-Id: Ibba6231d36427985da6c258002e319e33a15b9b8
Martijn Coenen [Fri, 30 Aug 2013 19:57:42 +0000 (12:57 -0700)]
NFC Tap&Pay: deal with changes from API review.
Also, removed "Ask every time" mode.
Bug:
10550349
Change-Id: If7c300f9f446e3c31d594116ac8e20fb50d9ec3f
Tom O'Neill [Fri, 30 Aug 2013 17:52:55 +0000 (10:52 -0700)]
Adapt to renaming of SettingInjectorService API constants
- Log how long it took to read the status of each setting.
- Fix some variable names.
- Affects b/
10461474
Change-Id: Ic0a575f090bf7192b20e07c231bf9d7238571808
Russell Brenner [Wed, 28 Aug 2013 16:44:30 +0000 (09:44 -0700)]
Add resources for light theme
Bug:
10407819
Change-Id: Ie232b2d48a8d67355d7c31a878ebaa79aae7c44d
Maggie Benthall [Fri, 30 Aug 2013 13:56:29 +0000 (06:56 -0700)]
am
ac19f2bc: Merge "Fixes for pin-restricted settings." into klp-dev
* commit '
ac19f2bc1c65865fa59feb7fbd9e19dd259048c3':
Fixes for pin-restricted settings.
Maggie Benthall [Fri, 30 Aug 2013 13:54:28 +0000 (13:54 +0000)]
Merge "Fixes for pin-restricted settings." into klp-dev
Wink Saville [Fri, 30 Aug 2013 03:42:59 +0000 (20:42 -0700)]
am
e38165ca: am
7bee4c29: Use correct action string for provisioning.
* commit '
e38165caf08a164999b9518dd1f16c9f94d581e9':
Use correct action string for provisioning.
Wink Saville [Fri, 30 Aug 2013 03:41:04 +0000 (20:41 -0700)]
am
7bee4c29: Use correct action string for provisioning.
* commit '
7bee4c294204be49edf58e9251726425ffcc5748':
Use correct action string for provisioning.
Wink Saville [Fri, 30 Aug 2013 02:58:09 +0000 (19:58 -0700)]
Use correct action string for provisioning.
Change to use the correct action string
com.adnroid.server.connectivityservice.CONNECTED_TO_PROVISIONING_NETWORK
Bug:
10551510
Change-Id: I917de4fcde06b72f520dec38e42c50859b2ee098
Chong Zhang [Thu, 29 Aug 2013 22:33:12 +0000 (15:33 -0700)]
wifi-display: add drop down list for Wps config method
Bug:
9371882
Change-Id: I8c8c645bbb3db9f9d038f015f6aa6078ce3e56c3
Lifu Tang [Thu, 29 Aug 2013 23:46:37 +0000 (16:46 -0700)]
am
5aacc542: Merge "Replaced ContentQueryMap with CursorLoader" into klp-dev
* commit '
5aacc54289ab813fdefc2d6b3e8473a241706232':
Replaced ContentQueryMap with CursorLoader
Lifu Tang [Thu, 29 Aug 2013 23:43:59 +0000 (23:43 +0000)]
Merge "Replaced ContentQueryMap with CursorLoader" into klp-dev
Wink Saville [Thu, 29 Aug 2013 22:17:48 +0000 (15:17 -0700)]
am
ec3c7762: am
1bc2db22: am
0e042a44: am
289c2f0d: Merge "Use MOBILE_PROVISIONING_ACTION for manage mobile plan." into jb-mr2-dev
* commit '
ec3c7762129429e0666f77f812849181f3be461a':
Use MOBILE_PROVISIONING_ACTION for manage mobile plan.
Wink Saville [Thu, 29 Aug 2013 22:15:53 +0000 (15:15 -0700)]
am
1bc2db22: am
0e042a44: am
289c2f0d: Merge "Use MOBILE_PROVISIONING_ACTION for manage mobile plan." into jb-mr2-dev
* commit '
1bc2db2221f6cdb92cce5d40f9eb940fe0ed4914':
Use MOBILE_PROVISIONING_ACTION for manage mobile plan.
Wink Saville [Thu, 29 Aug 2013 22:14:05 +0000 (15:14 -0700)]
am
79e2c32c: Merge "Use MOBILE_PROVISIONING_ACTION for manage mobile plan." into klp-dev
* commit '
79e2c32cfb96f617a4a8514f70d55d49ef509f43':
Use MOBILE_PROVISIONING_ACTION for manage mobile plan.
Wink Saville [Thu, 29 Aug 2013 22:11:11 +0000 (22:11 +0000)]
Merge "Use MOBILE_PROVISIONING_ACTION for manage mobile plan." into klp-dev
Maggie Benthall [Thu, 29 Aug 2013 14:49:13 +0000 (10:49 -0400)]
Fixes for pin-restricted settings.
- Reprompt for pin after screen has been locked and unlocked.
- For protected preferences, store the Preference and continue if pin entry is successful.
- Protect whole UserSettings and DevelopmentSettings pages.
Bug:
10543207
Change-Id: If1d4b31ca94a8cfc103625b74385bcd0bdd3d88b
Lifu Tang [Thu, 29 Aug 2013 21:42:12 +0000 (14:42 -0700)]
Replaced ContentQueryMap with CursorLoader
- Piggyback a trivial typo fix from previous change
- Fix b/
10228666
Change-Id: I96c4f5c434b67caf10b3406eec4f3f7c5cf846e9
Tom O'Neill [Thu, 29 Aug 2013 21:26:27 +0000 (14:26 -0700)]
am
4f08ddb2: Merge "Make sure we\'ve finished loading settings before processing any reloads" into klp-dev
* commit '
4f08ddb28c4569004f888ea2955667b27485adf8':
Make sure we've finished loading settings before processing any reloads
Tom O'Neill [Thu, 29 Aug 2013 21:22:54 +0000 (21:22 +0000)]
Merge "Make sure we've finished loading settings before processing any reloads" into klp-dev
Wink Saville [Wed, 28 Aug 2013 21:26:27 +0000 (14:26 -0700)]
Use MOBILE_PROVISIONING_ACTION for manage mobile plan.
Bug:
10328264
Change-Id: I3925004011bb1243793c4c1b963d923dc2b00cb5
Martijn Coenen [Thu, 29 Aug 2013 21:06:24 +0000 (14:06 -0700)]
am
ad320aa8: Merge "Update NFC payments to match new framework APIs." into klp-dev
* commit '
ad320aa8d350e859a87269c67d6afd2f5401cf61':
Update NFC payments to match new framework APIs.
Martijn Coenen [Thu, 29 Aug 2013 21:01:16 +0000 (21:01 +0000)]
Merge "Update NFC payments to match new framework APIs." into klp-dev
Wink Saville [Thu, 29 Aug 2013 18:57:48 +0000 (11:57 -0700)]
am
0e042a44: am
289c2f0d: Merge "Use MOBILE_PROVISIONING_ACTION for manage mobile plan." into jb-mr2-dev
* commit '
0e042a44a8ee0e26d92be8d73d7ed297b4beab37':
Use MOBILE_PROVISIONING_ACTION for manage mobile plan.
Lifu Tang [Thu, 29 Aug 2013 18:33:18 +0000 (11:33 -0700)]
am
1f2779f2: Merge "Fixed the widget location toggle button" into klp-dev
* commit '
1f2779f2c46ab14e4f912a5f330b26c0a59ec137':
Fixed the widget location toggle button
Lifu Tang [Thu, 29 Aug 2013 18:31:27 +0000 (18:31 +0000)]
Merge "Fixed the widget location toggle button" into klp-dev
Tom O'Neill [Thu, 29 Aug 2013 17:48:13 +0000 (10:48 -0700)]
Make sure we've finished loading settings before processing any reloads
- Effectively throttles case where many reloads are sent in rapid
succession.
- Simplify Handler state machine by making the state explicit instead
of implicit in the sequence of messages.
- To guard against cascading timeouts due to RAM pressure or other
systemic issues, only start additional services if there is at most one
timed out setting at a time.
- Add some log messages
- Fix b/
10487253
Change-Id: Ibe21533f7b644bbadf5b56b61ca0e28b49192470
Wink Saville [Thu, 29 Aug 2013 17:23:04 +0000 (10:23 -0700)]
am
289c2f0d: Merge "Use MOBILE_PROVISIONING_ACTION for manage mobile plan." into jb-mr2-dev
* commit '
289c2f0d3013f423849a9485b3044f0a1fc8dd92':
Use MOBILE_PROVISIONING_ACTION for manage mobile plan.
Wink Saville [Thu, 29 Aug 2013 17:20:24 +0000 (17:20 +0000)]
Merge "Use MOBILE_PROVISIONING_ACTION for manage mobile plan." into jb-mr2-dev
Baligh Uddin [Thu, 29 Aug 2013 15:04:27 +0000 (08:04 -0700)]
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
Baligh Uddin [Thu, 29 Aug 2013 15:00:59 +0000 (08:00 -0700)]
am
0aad9801: (-s ours) am
439b1543: (-s ours) am
17d0af91: (-s ours) Import translations. DO NOT MERGE
* commit '
0aad9801705675c246fe548f687ed14359b53f78':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 29 Aug 2013 14:59:30 +0000 (07:59 -0700)]
am
f7b5ad80: (-s ours) am
da7395d6: (-s ours) am
c7902845: (-s ours) Import translations. DO NOT MERGE
* commit '
f7b5ad80a8e31d717ffed1a0b7a1403c3bf75cd1':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 29 Aug 2013 14:57:04 +0000 (07:57 -0700)]
am
da7395d6: (-s ours) am
c7902845: (-s ours) Import translations. DO NOT MERGE
* commit '
da7395d6c5a92738c2e7130590f30a536ec94b54':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 29 Aug 2013 14:56:04 +0000 (07:56 -0700)]
am
439b1543: (-s ours) am
17d0af91: (-s ours) Import translations. DO NOT MERGE
* commit '
439b1543119fd97d134c602d92fc6ce9a517be20':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 29 Aug 2013 14:54:22 +0000 (07:54 -0700)]
am
02f3f202: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
02f3f2028fbd50ad39936e5b295d89039469fb7c':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 29 Aug 2013 14:53:56 +0000 (07:53 -0700)]
am
c7902845: (-s ours) Import translations. DO NOT MERGE
* commit '
c79028454106f4e73702c4bd4dde36a37beca90c':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 29 Aug 2013 14:53:47 +0000 (07:53 -0700)]
am
17d0af91: (-s ours) Import translations. DO NOT MERGE
* commit '
17d0af9160697f0fcb2d33ed4b4e91ad6769141c':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 29 Aug 2013 14:50:25 +0000 (14:50 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 29 Aug 2013 06:36:55 +0000 (23:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: I778a192cc22364fde11327c0e5e0d92dce6ef965
Auto-generated-cl: translation import
Baligh Uddin [Thu, 29 Aug 2013 06:33:19 +0000 (23:33 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2373253c983b6298e17d38882fc85ada1fd2e6e2
Auto-generated-cl: translation import
Baligh Uddin [Thu, 29 Aug 2013 06:32:03 +0000 (23:32 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7e0a050642f956f175dcb349945089b4515c1bb5
Auto-generated-cl: translation import
Martijn Coenen [Thu, 29 Aug 2013 02:28:17 +0000 (19:28 -0700)]
Update NFC payments to match new framework APIs.
Bug:
10262585
Change-Id: Id4167db50f8e5fe145441bdf73d151a61a8587ed
Amith Yamasani [Thu, 29 Aug 2013 01:07:51 +0000 (18:07 -0700)]
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
Amith Yamasani [Thu, 29 Aug 2013 01:04:10 +0000 (01:04 +0000)]
Merge "Fix RTL layout of text in Battery history screen" into klp-dev
Lifu Tang [Wed, 28 Aug 2013 22:55:49 +0000 (15:55 -0700)]
Fixed the widget location toggle button
- Fix b/
10531669
Change-Id: Iba08d515119c42e5c4de4ee02d6dd8aea404fc69