OSDN Git Service
The Android Automerger [Fri, 6 Sep 2013 18:31:38 +0000 (11:31 -0700)]
merge in master-release history after reset to master
Baligh Uddin [Fri, 6 Sep 2013 16:52:16 +0000 (09:52 -0700)]
am
8d697e7f: (-s ours) am
f1e0c65e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
8d697e7fbfddf9fc859851314c4b4634aac58be9':
Import translations. DO NOT MERGE
Lifu Tang [Fri, 6 Sep 2013 16:52:06 +0000 (09:52 -0700)]
am
f534039f: am
0a0635c1: Merge "Don\'t show explicit time when no recent apps" into klp-dev
* commit '
f534039f0cdb595c4d7204ce2b4eead042cf9e4c':
Don't show explicit time when no recent apps
Baligh Uddin [Fri, 6 Sep 2013 03:36:00 +0000 (20:36 -0700)]
am
f1e0c65e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
f1e0c65efb0c1f070d4202170843bec26743fd31':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 6 Sep 2013 03:34:28 +0000 (03:34 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Fri, 6 Sep 2013 03:34:18 +0000 (03:34 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Lifu Tang [Fri, 6 Sep 2013 02:03:28 +0000 (19:03 -0700)]
am
0a0635c1: Merge "Don\'t show explicit time when no recent apps" into klp-dev
* commit '
0a0635c10ebf73d8133a7f96d6cae89ea9282dd2':
Don't show explicit time when no recent apps
Lifu Tang [Fri, 6 Sep 2013 02:01:17 +0000 (02:01 +0000)]
Merge "Don't show explicit time when no recent apps" into klp-dev
Amith Yamasani [Fri, 6 Sep 2013 00:33:21 +0000 (17:33 -0700)]
am
b38edd12: am
256637ff: Merge "Handle renamed APIs" into klp-dev
* commit '
b38edd12c5af75325cf74c13c107607a6296b110':
Handle renamed APIs
Amith Yamasani [Thu, 5 Sep 2013 22:51:37 +0000 (15:51 -0700)]
am
256637ff: Merge "Handle renamed APIs" into klp-dev
* commit '
256637ffb3cd5482aff5d1d38b45145d1caab0a8':
Handle renamed APIs
Amith Yamasani [Thu, 5 Sep 2013 22:49:20 +0000 (22:49 +0000)]
Merge "Handle renamed APIs" into klp-dev
Lifu Tang [Thu, 5 Sep 2013 21:55:54 +0000 (14:55 -0700)]
am
76eed4ec: am
8aea7b4d: Merge "Fixed the NullPointerException" into klp-dev
* commit '
76eed4ecd498c7f9f21dab0df1f51fbf23ffa35c':
Fixed the NullPointerException
Lifu Tang [Thu, 5 Sep 2013 21:52:12 +0000 (14:52 -0700)]
am
8aea7b4d: Merge "Fixed the NullPointerException" into klp-dev
* commit '
8aea7b4d3d79163912f55a2d37657c4d33109655':
Fixed the NullPointerException
Lifu Tang [Thu, 5 Sep 2013 21:50:29 +0000 (14:50 -0700)]
Don't show explicit time when no recent apps
- Partial fix for b/
10638903
Change-Id: I38d681c52b3d03cdece48d3cdc027dcbe66bd0f2
Lifu Tang [Thu, 5 Sep 2013 21:47:00 +0000 (21:47 +0000)]
Merge "Fixed the NullPointerException" into klp-dev
Svetoslav Ganov [Thu, 5 Sep 2013 21:45:11 +0000 (14:45 -0700)]
am
e4443058: am
10cbbc55: Merge "Print settings polish" into klp-dev
* commit '
e44430583a40dfc178924256cc4e6776f9d00701':
Print settings polish
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
Lifu Tang [Thu, 5 Sep 2013 20:52:55 +0000 (13:52 -0700)]
Fixed the NullPointerException
- Fix b/
10633295
Change-Id: Ia429e679c53c959351316ffda7619e10ad6a626c
Baligh Uddin [Thu, 5 Sep 2013 19:52:47 +0000 (12:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: I15246270911f331f81c3e621baf82f90335529be
Auto-generated-cl: translation import
Baligh Uddin [Thu, 5 Sep 2013 19:46:15 +0000 (12:46 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4e3b8d9ebc0a38940b8864bbee841002385f5fb2
Auto-generated-cl: translation import
Amith Yamasani [Thu, 5 Sep 2013 19:40:31 +0000 (12:40 -0700)]
Handle renamed APIs
Bug:
10461761
Change-Id: If63c3801663b347a4643e44d5bd3bab4e3049578
Przemyslaw Szczepaniak [Thu, 5 Sep 2013 13:29:02 +0000 (06:29 -0700)]
am
3730334d: am
80c2b9b0: Hide "Play TTS sample" when locale is not settable as default
* commit '
3730334d5b9355cad691c422272c88546035deca':
Hide "Play TTS sample" when locale is not settable as default
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:36:12 +0000 (18:36 -0700)]
am
ec4f5ed1: am
dd600b60: Merge "Add details screen to proc stats." into klp-dev
* commit '
ec4f5ed1a95bd26e68766252f19c407b1479bb83':
Add details screen to proc stats.
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
Svetoslav [Thu, 5 Sep 2013 00:43:48 +0000 (17:43 -0700)]
am
8ed62da6: am
f7092bc6: Merge "Implementing print settings as per UX spec." into klp-dev
* commit '
8ed62da68b1682245e2c8d093c96a6a3f169679a':
Implementing print settings as per UX spec.
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:14:34 +0000 (15:14 -0700)]
am
4459ca50: am
35ec3b7f: Merge "wifi-display: add drop down list for Wps config method" into klp-dev
* commit '
4459ca503c68edaaba357ce577c5dee0e586b252':
wifi-display: add drop down list for Wps config method
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:24:44 +0000 (07:24 -0700)]
am
f49005f9: am
97df9822: Merge "Switch to receiving LocationManager.MODE_CHANGED_ACTION" into klp-dev
* commit '
f49005f9ab2d470488d24c2b534787768ebc8ebb':
Switch to receiving LocationManager.MODE_CHANGED_ACTION
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:04:57 +0000 (22:04 -0700)]
am
538f03a2: (-s ours) am
c63e097a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
538f03a2857c1b40663c597cd85368a21b628263':
Import translations. DO NOT MERGE
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:14 +0000 (05:00 +0000)]
Merge "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:02:53 +0000 (18:02 -0700)]
am
43ce434c: am
9b444f78: Merge "Pass correct user id for the extra" into klp-dev
* commit '
43ce434c2c4c1f062bd3e41cc558e3bfdc22dfc8':
Pass correct user id for the extra
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
Geoffrey Borggaard [Wed, 4 Sep 2013 00:45:25 +0000 (17:45 -0700)]
am
67f93f16: am
af6cdb2b: Merge "Pin protect going into developer mode." into klp-dev
* commit '
67f93f16505d8c439ace54e9849c3003e273afaf':
Pin protect going into developer mode.
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:18:37 +0000 (17:18 -0700)]
am
1a72ab95: am
f4c4294c: Merge "Renamed "Location services" to "App settings"" into klp-dev
* commit '
1a72ab950d64ef4e13180bea78f3c215fb5f9159':
Renamed "Location services" to "App settings"
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:57:11 +0000 (16:57 -0700)]
am
4fba9109: am
58db3418: Merge "Show regulatory info based on hardware sku in Settings app." into klp-dev
* commit '
4fba910955f54616baf462646bcc21e762d197d1':
Show regulatory info based on hardware sku in Settings app.
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:31:45 +0000 (14:31 -0700)]
am
42f82284: am
b3cd38ea: Merge "Fixed the crash on screen rotation" into klp-dev
* commit '
42f82284a10163033842b1c93a8e767ca0527046':
Fixed the crash on screen rotation
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:08:34 +0000 (14:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idb25d35ebc6e5786e8cdf09ac97ee2f902f18249
Auto-generated-cl: translation import
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:34:40 +0000 (13:34 -0700)]
am
8725d762: am
69a50431: Merge changes Ie232b2d4,I81b6bf3f into klp-dev
* commit '
8725d762038cd8af819ba45eee230e3af3623e0c':
Add resources for light theme
Support Holo Light theme for wifi during setup
Tom O'Neill [Tue, 3 Sep 2013 20:34:39 +0000 (13:34 -0700)]
am
dc39241b: am
81eae57f: Merge "Adapt to renaming of SettingInjectorService API constants" into klp-dev
* commit '
dc39241b536bddb3e099832e2e2d483d65c60a97':
Adapt to renaming of SettingInjectorService API constants
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 18:00:39 +0000 (11:00 -0700)]
am
703689be: am
7e2227fc: Merge "Ignores AppOps entries belonging to other users" into klp-dev
* commit '
703689beed8b39b30f0fd57f9735f3f800bd86b3':
Ignores AppOps entries belonging to other users
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:34:45 +0000 (10:34 -0700)]
am
2b8511c1: am
ec8f11da: Merge "NFC Tap&Pay: deal with changes from API review." into klp-dev
* commit '
2b8511c1531c1b213f2a23d23772eb8df550cc5a':
NFC Tap&Pay: deal with changes from API review.
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:12:20 +0000 (10:12 -0700)]
am
026702df: am
06659c5a: Merge "Creates Sipper even the consumption is very little" into klp-dev
* commit '
026702dff008408c90678584332b1a798ed5fb90':
Creates Sipper even the consumption is very little
Lifu Tang [Tue, 3 Sep 2013 17:12:19 +0000 (10:12 -0700)]
am
79063a45: am
47aab2ee: Merge "Shows correct state when location sharing disabled" into klp-dev
* commit '
79063a456932f91d521a80f9c643ca1397654698':
Shows correct state when location sharing disabled
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:02:41 +0000 (09:02 -0700)]
am
c6380a26: am
a2aaf0e6: Merge "Add a missing fragment to list of valid ones for top-level settings" into klp-dev
* commit '
c6380a2622978fefb9b007e3ad09744ab1aff20b':
Add a missing fragment to list of valid ones for top-level settings
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:31:17 +0000 (17:31 -0700)]
am
c2fbc774: am
a2904f9d: am
d5c71fc4: am
e38165ca: am
7bee4c29: Use correct action string for provisioning.
* commit '
c2fbc77451546a51c82d2b50825a7a0e51e4e0a1':
Use correct action string for provisioning.
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:42:50 +0000 (14:42 -0700)]
am
c7e34676: am
6dde146d: Merge "Update captioning settings to match revised API" into klp-dev
* commit '
c7e34676ffffa03269f5686072abd5eae60fa85f':
Update captioning settings to match revised API
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
OSDN Git Service
