Lifu Tang
7e2227fc65
Merge "Ignores AppOps entries belonging to other users" into klp-dev
2013-09-03 17:55:48 +00:00
Martijn Coenen
ec8f11da8f
Merge "NFC Tap&Pay: deal with changes from API review." into klp-dev
2013-09-03 17:25:15 +00:00
Lifu Tang
c670c97b98
Ignores AppOps entries belonging to other users
...
- Fix b/10567352
Change-Id: I6aac030a426e5a881578b518a9cf6bad8679d087
2013-09-03 10:03:48 -07:00
Lifu Tang
06659c5a55
Merge "Creates Sipper even the consumption is very little" into klp-dev
2013-09-03 17:01:56 +00:00
Lifu Tang
47aab2eed7
Merge "Shows correct state when location sharing disabled" into klp-dev
2013-09-03 17:01:34 +00:00
Amith Yamasani
a2aaf0e60f
Merge "Add a missing fragment to list of valid ones for top-level settings" into klp-dev
2013-09-03 15:57:24 +00:00
Lifu Tang
ad7bfbd346
Creates Sipper even the consumption is very little
...
Change-Id: I9682f262a481f3586760b8464b96eeb22814a840
2013-09-03 08:08:02 -07:00
Wink Saville
a2904f9d50
am d5c71fc4
: am e38165ca
: am 7bee4c29
: Use correct action string for provisioning.
...
* commit 'd5c71fc4e613d80d1ff8c128f29d9c201bcb3f90':
Use correct action string for provisioning.
2013-08-30 17:26:19 -07:00
Lifu Tang
9294fdb6f8
Shows correct state when location sharing disabled
...
- Fix b/10553306
Change-Id: I01f69aaeb79e18ddf29da5aef7ea00938e674429
2013-08-30 17:19:09 -07:00
Amith Yamasani
3a14ae2655
Add a missing fragment to list of valid ones for top-level settings
...
Bug: 10552817
Change-Id: I1ea80de565d1ec58da834cdd67dab0cb71e635b7
2013-08-30 15:43:44 -07:00
Alan Viverette
6dde146df0
Merge "Update captioning settings to match revised API" into klp-dev
2013-08-30 21:35:04 +00:00
Martijn Coenen
a73aa32278
NFC Tap&Pay: deal with changes from API review.
...
Also, removed "Ask every time" mode.
Bug: 10550349
Change-Id: If7c300f9f446e3c31d594116ac8e20fb50d9ec3f
2013-08-30 12:57:42 -07:00
Maggie Benthall
ac19f2bc1c
Merge "Fixes for pin-restricted settings." into klp-dev
2013-08-30 13:54:29 +00:00
Wink Saville
d5c71fc4e6
am e38165ca
: am 7bee4c29
: Use correct action string for provisioning.
...
* commit 'e38165caf08a164999b9518dd1f16c9f94d581e9':
Use correct action string for provisioning.
2013-08-29 20:42:59 -07:00
Wink Saville
e38165caf0
am 7bee4c29
: Use correct action string for provisioning.
...
* commit '7bee4c294204be49edf58e9251726425ffcc5748':
Use correct action string for provisioning.
2013-08-29 20:41:04 -07:00
Wink Saville
7bee4c2942
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
2013-08-29 19:58:09 -07:00
Lifu Tang
5aacc54289
Merge "Replaced ContentQueryMap with CursorLoader" into klp-dev
2013-08-29 23:43:59 +00:00
Wink Saville
ec3c776212
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.
2013-08-29 15:15:53 -07:00
Wink Saville
79e2c32cfb
Merge "Use MOBILE_PROVISIONING_ACTION for manage mobile plan." into klp-dev
2013-08-29 22:11:12 +00:00
Maggie Benthall
4453496448
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
2013-08-29 18:06:13 -04:00
Lifu Tang
007994279c
Replaced ContentQueryMap with CursorLoader
...
- Piggyback a trivial typo fix from previous change
- Fix b/10228666
Change-Id: I96c4f5c434b67caf10b3406eec4f3f7c5cf846e9
2013-08-29 14:46:29 -07:00
Tom O'Neill
4f08ddb28c
Merge "Make sure we've finished loading settings before processing any reloads" into klp-dev
2013-08-29 21:22:54 +00:00
Wink Saville
e24e596b08
Use MOBILE_PROVISIONING_ACTION for manage mobile plan.
...
Bug: 10328264
Change-Id: I3925004011bb1243793c4c1b963d923dc2b00cb5
2013-08-29 14:15:01 -07:00
Martijn Coenen
ad320aa8d3
Merge "Update NFC payments to match new framework APIs." into klp-dev
2013-08-29 21:01:16 +00:00
Wink Saville
1bc2db2221
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.
2013-08-29 11:57:48 -07:00
Lifu Tang
1f2779f2c4
Merge "Fixed the widget location toggle button" into klp-dev
2013-08-29 18:31:27 +00:00
Tom O'Neill
f06dc32163
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
2013-08-29 10:48:13 -07:00
Wink Saville
0e042a44a8
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.
2013-08-29 10:23:04 -07:00
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
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
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
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
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
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
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