OSDN Git Service
Lifu Tang [Tue, 8 Oct 2013 18:58:44 +0000 (11:58 -0700)]
am
40eefc17: am
1673fbc0: Broadcasting a message for mode changing
* commit '
40eefc17d877357e074fff34c670b6e61f71deeb':
Broadcasting a message for mode changing
Lifu Tang [Tue, 8 Oct 2013 18:53:27 +0000 (11:53 -0700)]
am
1673fbc0: Broadcasting a message for mode changing
* commit '
1673fbc029d569b6424914db48e571b52091b4fc':
Broadcasting a message for mode changing
Lifu Tang [Tue, 8 Oct 2013 09:24:17 +0000 (02:24 -0700)]
Broadcasting a message for mode changing
- Fix b/
10974059
Change-Id: I219ea35e65a36af9f041a487dd8039bb5e2f048b
Baligh Uddin [Tue, 8 Oct 2013 03:54:41 +0000 (20:54 -0700)]
am
6b590746: (-s ours) am
1955bf1b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
6b590746dfdb3f721dab048a1978a5630da9e5eb':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 8 Oct 2013 03:51:30 +0000 (20:51 -0700)]
am
1955bf1b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
1955bf1bb3147a06d1856ac002f8cd5aab4f535e':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 8 Oct 2013 03:51:06 +0000 (20:51 -0700)]
am
ebaa7509: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
* commit '
ebaa7509edda445e1d809b331d9ecc848fe19773':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 8 Oct 2013 03:49:34 +0000 (03:49 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-ub-dev
Baligh Uddin [Tue, 8 Oct 2013 03:49:14 +0000 (03:49 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Tue, 8 Oct 2013 02:02:02 +0000 (19:02 -0700)]
Import translations. DO NOT MERGE
Change-Id: If370e7dc3d5de024ec3a6afd037019226fe45569
Auto-generated-cl: translation import
Baligh Uddin [Tue, 8 Oct 2013 01:55:29 +0000 (18:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8cdb9b939a3985f7eb7813fa0bfbc3129ca8638d
Auto-generated-cl: translation import
Chris Wren [Mon, 7 Oct 2013 20:09:39 +0000 (13:09 -0700)]
am
98b30cea: am
a50f7851: Merge "Hide Camera in CryptKeeperConfirm" into klp-dev
* commit '
98b30ceaa2ef049f41907ea9672bb5f028472f1c':
Hide Camera in CryptKeeperConfirm
Chris Wren [Mon, 7 Oct 2013 20:06:45 +0000 (13:06 -0700)]
am
a50f7851: Merge "Hide Camera in CryptKeeperConfirm" into klp-dev
* commit '
a50f78515e2718fa5e47f283e25705806bd163aa':
Hide Camera in CryptKeeperConfirm
Chris Wren [Mon, 7 Oct 2013 20:01:35 +0000 (20:01 +0000)]
Merge "Hide Camera in CryptKeeperConfirm" into klp-dev
David Braun [Mon, 7 Oct 2013 18:15:39 +0000 (11:15 -0700)]
am
a633e1d5: am
1c17255d: Block "SMS Default Dialog" on non-phone devices
* commit '
a633e1d54d28d5c646b1f99df62a9250e48340ce':
Block "SMS Default Dialog" on non-phone devices
David Braun [Mon, 7 Oct 2013 18:13:22 +0000 (11:13 -0700)]
am
1c17255d: Block "SMS Default Dialog" on non-phone devices
* commit '
1c17255d5edadaf1790af365d2ed5f962a7bcc65':
Block "SMS Default Dialog" on non-phone devices
David Braun [Mon, 7 Oct 2013 16:35:52 +0000 (09:35 -0700)]
Block "SMS Default Dialog" on non-phone devices
This change also handles the case where getDefaultSmsApplication returns
null more elegantly, though this is only really possible on a device that
is a tablet (blocked earlier in the method) or a phone device that had no
SMS apps at boot (when we force the setting of an SMS app.)
Bug:
11072894 People app should not launch into default SMS app on tablets
Change-Id: I1e253873e053c21bc1652bd03d7b486aaf9be5e1
Chris Wren [Mon, 7 Oct 2013 05:11:08 +0000 (01:11 -0400)]
Hide Camera in CryptKeeperConfirm
Bug:
10900437
Change-Id: Ie9bbe3bacba6fb37ddd6c2753e011dc7abb63c77
Baligh Uddin [Sat, 5 Oct 2013 16:37:01 +0000 (09:37 -0700)]
am
040cfe56: (-s ours) am
8aecb7ce: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
040cfe56112326d470a58b2f55642a234ff3fce2':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 5 Oct 2013 03:41:16 +0000 (20:41 -0700)]
am
8aecb7ce: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
8aecb7cea083366fc85d8088d7e5e18e775fee80':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 5 Oct 2013 03:40:32 +0000 (20:40 -0700)]
am
249100c1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
* commit '
249100c1151569a9e903489b2f496446f740cc29':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 5 Oct 2013 03:38:17 +0000 (03:38 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-ub-dev
Baligh Uddin [Sat, 5 Oct 2013 03:37:53 +0000 (03:37 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Sat, 5 Oct 2013 01:44:36 +0000 (18:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6da7d93122a4b4b00a05fbabb5170b935610dfc2
Auto-generated-cl: translation import
Baligh Uddin [Sat, 5 Oct 2013 01:40:44 +0000 (18:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: I97e1bf2ace031bcf591507987bd5d6ae9c6160fd
Auto-generated-cl: translation import
Svetoslav [Sat, 5 Oct 2013 01:05:11 +0000 (18:05 -0700)]
am
32d7ea74: am
9379d935: Make printers for a print service not react to press.
* commit '
32d7ea74074875b43df22369e915c177e67a0316':
Make printers for a print service not react to press.
Svetoslav [Sat, 5 Oct 2013 01:02:19 +0000 (18:02 -0700)]
am
9379d935: Make printers for a print service not react to press.
* commit '
9379d935552118e33ccee5aa8383d8f86bdff113':
Make printers for a print service not react to press.
Svetoslav [Sat, 5 Oct 2013 00:52:36 +0000 (17:52 -0700)]
Make printers for a print service not react to press.
We show a list of printers for the a print service in the
print service settings activity. This list is there to
inform the user of which printers are available and
optionally offers adding a printer affordance. The printer
list items do nothing so they should not react to press
and create a false impression they do.
bug:
10983508
Change-Id: I43b19ebb0acf6662c489826c192fd6daf8ad103d
Amith Yamasani [Fri, 4 Oct 2013 23:03:05 +0000 (16:03 -0700)]
am
b46e57ee: am
4a4a1b8b: Merge "Use a public media content uri for viewing local media files" into klp-dev
* commit '
b46e57ee261578ffb45c0b679b56b26f6dfe1208':
Use a public media content uri for viewing local media files
Amith Yamasani [Fri, 4 Oct 2013 23:00:44 +0000 (16:00 -0700)]
am
4a4a1b8b: Merge "Use a public media content uri for viewing local media files" into klp-dev
* commit '
4a4a1b8b96dd01aacfd82f189d5222baf9eafba9':
Use a public media content uri for viewing local media files
Amith Yamasani [Fri, 4 Oct 2013 22:58:05 +0000 (22:58 +0000)]
Merge "Use a public media content uri for viewing local media files" into klp-dev
Ari Sachter-Zeltzer [Fri, 4 Oct 2013 22:55:39 +0000 (15:55 -0700)]
am
916a50db: am
0a9d037b: updated launcher settings icon to gray gear
* commit '
916a50dbabd4a1c775e92518eaf43bd555ceef00':
updated launcher settings icon to gray gear
Ari Sachter-Zeltzer [Fri, 4 Oct 2013 22:53:50 +0000 (15:53 -0700)]
am
0a9d037b: updated launcher settings icon to gray gear
* commit '
0a9d037bed992adda30da67e95b8cad1904f954c':
updated launcher settings icon to gray gear
Amith Yamasani [Fri, 4 Oct 2013 21:27:21 +0000 (14:27 -0700)]
Use a public media content uri for viewing local media files
Bug:
11061566
Change-Id: I7e049f48d37a68a0a41b7a62383eea71f3938c44
Ari Sachter-Zeltzer [Fri, 4 Oct 2013 21:21:36 +0000 (14:21 -0700)]
updated launcher settings icon to gray gear
fixes b/
10788190
Change-Id: I11f21d7614fe70781ae2d20ab2947c77843580fa
Amith Yamasani [Fri, 4 Oct 2013 20:34:44 +0000 (13:34 -0700)]
am
658e6807: am
16d358da: Merge "Exit restrictions fragment if user was deleted" into klp-dev
* commit '
658e6807aebb451721c413c0becd1ac0fd3bbfcc':
Exit restrictions fragment if user was deleted
Vinit Deshapnde [Fri, 4 Oct 2013 20:34:01 +0000 (13:34 -0700)]
am
2337e472: am
db750e8f: Merge "Fix EAP-TLS reconnect after reboot issue" into klp-dev
* commit '
2337e472d6bfd4cb8812a9cdfb5fa66b728b1693':
Fix EAP-TLS reconnect after reboot issue
Amith Yamasani [Fri, 4 Oct 2013 19:56:37 +0000 (12:56 -0700)]
am
16d358da: Merge "Exit restrictions fragment if user was deleted" into klp-dev
* commit '
16d358daf00b54c2ecfe5f5b8de8de5a8cfa14ef':
Exit restrictions fragment if user was deleted
Amith Yamasani [Fri, 4 Oct 2013 19:55:18 +0000 (19:55 +0000)]
Merge "Exit restrictions fragment if user was deleted" into klp-dev
Vinit Deshapnde [Fri, 4 Oct 2013 19:02:19 +0000 (12:02 -0700)]
am
db750e8f: Merge "Fix EAP-TLS reconnect after reboot issue" into klp-dev
* commit '
db750e8f2cd20aa09875dfd54656df11e27151bf':
Fix EAP-TLS reconnect after reboot issue
Vinit Deshapnde [Fri, 4 Oct 2013 18:20:41 +0000 (18:20 +0000)]
Merge "Fix EAP-TLS reconnect after reboot issue" into klp-dev
Amith Yamasani [Wed, 2 Oct 2013 00:09:32 +0000 (17:09 -0700)]
Exit restrictions fragment if user was deleted
When resuming the restricted user fragment, make sure that the user still
exists, as it may have been deleted by the restricted user.
Bug:
11010340
Change-Id: I3360dbc42586c5bb28013844f8c788e641ad8b6a
Baligh Uddin [Thu, 3 Oct 2013 22:40:38 +0000 (15:40 -0700)]
am
b3334e77: (-s ours) am
2274bb53: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
b3334e77a25cb3a62bb6b9554bf120fc82c80f8d':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 3 Oct 2013 19:19:12 +0000 (12:19 -0700)]
am
2274bb53: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
2274bb53cf9aa2e131ebbd9d0517d57436c31c36':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 3 Oct 2013 03:58:40 +0000 (03:58 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Svetoslav [Wed, 2 Oct 2013 23:55:27 +0000 (16:55 -0700)]
am
672b845e: Merge "Polish print settings accessibility." into klp-dev
* commit '
672b845eec350cc03402f5961f56ac47a5dac220':
Polish print settings accessibility.
Baligh Uddin [Wed, 2 Oct 2013 23:51:24 +0000 (16:51 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ice51de6939fa0e1c759ad7b76f3bc2392d64f57e
Auto-generated-cl: translation import
Svetoslav [Wed, 2 Oct 2013 23:48:07 +0000 (23:48 +0000)]
Merge "Polish print settings accessibility." into klp-dev
Svetoslav [Wed, 2 Oct 2013 22:08:00 +0000 (15:08 -0700)]
Polish print settings accessibility.
bug:
10983508
Change-Id: I986e28a2cd8e52b7c8422e825de9174d6e2377c3
Christopher Tate [Wed, 2 Oct 2013 22:16:02 +0000 (15:16 -0700)]
am
e7358028: Merge "Back out of Home settings when penultimate home app is uninstalled" into klp-dev
* commit '
e7358028d10f87d0499e3d85abf699824882b9e2':
Back out of Home settings when penultimate home app is uninstalled
Christopher Tate [Wed, 2 Oct 2013 22:11:50 +0000 (22:11 +0000)]
Merge "Back out of Home settings when penultimate home app is uninstalled" into klp-dev
Lifu Tang [Wed, 2 Oct 2013 22:09:36 +0000 (15:09 -0700)]
am
3846b539: Merge "Modified suggestion string for battery-saving mode" into klp-dev
* commit '
3846b5393820c96b96e0e0922f71514aaa8a2eee':
Modified suggestion string for battery-saving mode
Lifu Tang [Wed, 2 Oct 2013 22:03:39 +0000 (22:03 +0000)]
Merge "Modified suggestion string for battery-saving mode" into klp-dev
Amith Yamasani [Wed, 2 Oct 2013 21:29:39 +0000 (14:29 -0700)]
am
d462e868: Merge "Load account type icons in a background thread before scrolling down" into klp-dev
* commit '
d462e8686697094161930c76a648f75e8c6afd92':
Load account type icons in a background thread before scrolling down
David Braun [Wed, 2 Oct 2013 21:29:39 +0000 (14:29 -0700)]
am
6e5956eb: Merge "Default SMS app setting should still be shown even if SIM is removed." into klp-dev
* commit '
6e5956ebe2b9c3d06ea463bba5c864dad58e0c02':
Default SMS app setting should still be shown even if SIM is removed.
Lifu Tang [Wed, 2 Oct 2013 20:56:06 +0000 (13:56 -0700)]
Modified suggestion string for battery-saving mode
- Fix b/
11009797
Change-Id: I55a890348ec2d3ec79956306b65e58449d88dbd3
Christopher Tate [Tue, 1 Oct 2013 19:32:27 +0000 (12:32 -0700)]
Back out of Home settings when penultimate home app is uninstalled
When the user deletes the last-but-one, there's nothing more that
they can do in Home settings (and we'll be suppressing it from the
top level of the Settings UI as well), so we now back out with
a dialog explaining the situation.
Bug
10918801
Change-Id: Id03169dace976f7de639e3b3ab3d50ed161258d8
Amith Yamasani [Wed, 2 Oct 2013 20:19:45 +0000 (20:19 +0000)]
Merge "Load account type icons in a background thread before scrolling down" into klp-dev
David Braun [Wed, 2 Oct 2013 20:15:35 +0000 (20:15 +0000)]
Merge "Default SMS app setting should still be shown even if SIM is removed." into klp-dev
Amith Yamasani [Wed, 2 Oct 2013 18:48:46 +0000 (11:48 -0700)]
Load account type icons in a background thread before scrolling down
This reduces the jank when scrolling down in top-level Settings if you
happen to have several account types like Google, Twitter, Facebook, etc.
In the process of doing this, discovered that headers get built even when
they're not showing (SubSettings). Skip setting up the headers, which can
be expensive when there are several accounts.
Bug:
11006601
Change-Id: I8b4eafdcc2fc2beecac01317c3c8f07a82febcc0
Svetoslav Ganov [Wed, 2 Oct 2013 16:36:11 +0000 (09:36 -0700)]
am
ff75201a: Merge "Missing return statement if a print job is no longer present." into klp-dev
* commit '
ff75201aee750f76372b95ff8ac08d81cb738c7c':
Missing return statement if a print job is no longer present.
Lifu Tang [Wed, 2 Oct 2013 16:35:43 +0000 (09:35 -0700)]
am
c120c6cf: Fixed crash when rotating screen
* commit '
c120c6cf9f86ae56d98b2d6e22f68626b1b1665c':
Fixed crash when rotating screen
Lifu Tang [Wed, 2 Oct 2013 16:35:42 +0000 (09:35 -0700)]
am
5ab9fa43: Renamed "App settings" back to "Location services"
* commit '
5ab9fa432d17fe72c74a25770a26d405635cc0f6':
Renamed "App settings" back to "Location services"
Lifu Tang [Wed, 2 Oct 2013 16:35:34 +0000 (09:35 -0700)]
am
c6578818: Merge "Make recent location app list package based" into klp-dev
* commit '
c6578818d8984a4bb5fcd2d41844fc9e8e7d7a62':
Make recent location app list package based
Alon Albert [Wed, 2 Oct 2013 16:35:07 +0000 (09:35 -0700)]
am
394b80ce: Merge "Hide Camera in CryptKeeper" into klp-dev
* commit '
394b80ce5b7f590b60200b610b3f8d5f549dbc1e':
Hide Camera in CryptKeeper
Maggie Benthall [Wed, 2 Oct 2013 16:35:06 +0000 (09:35 -0700)]
am
490e072c: Merge "UX tweaks for CA cert monitoring" into klp-dev
* commit '
490e072c8494e59a9cf765c0451f5b445297a2f6':
UX tweaks for CA cert monitoring
Svetoslav [Wed, 2 Oct 2013 05:21:57 +0000 (22:21 -0700)]
am
1b881bcc: Merge "Show appropriate empty state if not printers are found." into klp-dev
* commit '
1b881bcc4181c240007a1d6d7a3e224b4f018933':
Show appropriate empty state if not printers are found.
Svetoslav [Wed, 2 Oct 2013 05:21:37 +0000 (22:21 -0700)]
am
033b5739: Merge "Remove Google Play specific search URIs from Settings." into klp-dev
* commit '
033b5739ba85fca62a8e74a6620c9a14cc9f3f5e':
Remove Google Play specific search URIs from Settings.
David Braun [Wed, 2 Oct 2013 00:10:46 +0000 (17:10 -0700)]
Default SMS app setting should still be shown even if SIM is removed.
Change-Id: Ia7bd7b690a2637999b96438667ebd4e4bed96051
Svetoslav Ganov [Tue, 1 Oct 2013 21:30:36 +0000 (21:30 +0000)]
Merge "Missing return statement if a print job is no longer present." into klp-dev
Lifu Tang [Mon, 30 Sep 2013 23:05:49 +0000 (16:05 -0700)]
Fixed crash when rotating screen
- Fix b/
11006855
Change-Id: I406727ca4260aae006e6128835f05f5f2ed9c1a3
Lifu Tang [Tue, 1 Oct 2013 00:03:25 +0000 (17:03 -0700)]
Renamed "App settings" back to "Location services"
- Fix b/
10610559
Change-Id: Id98a1b4e8d04238f371322fe6232647fa13b5c4a
Lifu Tang [Tue, 1 Oct 2013 19:04:00 +0000 (19:04 +0000)]
Merge "Make recent location app list package based" into klp-dev
Alon Albert [Tue, 1 Oct 2013 16:01:51 +0000 (16:01 +0000)]
Merge "Hide Camera in CryptKeeper" into klp-dev
Lifu Tang [Tue, 1 Oct 2013 15:24:55 +0000 (08:24 -0700)]
Make recent location app list package based
- Link all items to app info pages instead of battery page
- Fix b/
10855516
Change-Id: I241e81b179f468364b324ae714964fc3253cd2c9
Maggie Benthall [Tue, 1 Oct 2013 15:45:25 +0000 (15:45 +0000)]
Merge "UX tweaks for CA cert monitoring" into klp-dev
Jim Miller [Tue, 1 Oct 2013 12:26:44 +0000 (05:26 -0700)]
am
277827fb: Merge "Disable keyguard widgets on low memory devices" into klp-dev
* commit '
277827fb27957af41837d785647e94b3956f2bba':
Disable keyguard widgets on low memory devices
David Christie [Tue, 1 Oct 2013 12:26:44 +0000 (05:26 -0700)]
am
7cdb34f5: Merge "Change location settings "Device sensors" to "Device only" (b/
10992469). Note this is the minimum change for things visible to the user. I double checked the accessibility string description and it is still valid as is (it says "Use GPS to pinpoint
* commit '
7cdb34f50eb2c786998b4af943d49bb091b249cd':
Change location settings "Device sensors" to "Device only" (b/
10992469). Note this is the minimum change for things visible to the user. I double checked the accessibility string description and it is still valid as is (it says "Use GPS to pinpoint your location"). We can also change the internal code variable names to not say "sensors" but I would suggest doing this after KLP as is a noop in UI.
Martijn Coenen [Tue, 1 Oct 2013 12:26:08 +0000 (05:26 -0700)]
am
028b6b3f: Merge "Don\'t show tap&pay if NFC is off." into klp-dev
* commit '
028b6b3f7cc79587a42583351e2c032f71e7ac8c':
Don't show tap&pay if NFC is off.
Matthew Xie [Tue, 1 Oct 2013 12:26:07 +0000 (05:26 -0700)]
am
3b2fbe2f: Merge "Add Bluetooth Privileged permission to use pairing apis" into klp-dev
* commit '
3b2fbe2fb374c8b825b716b372d1c46fdc610bfa':
Add Bluetooth Privileged permission to use pairing apis
Svetoslav Ganov [Tue, 1 Oct 2013 07:23:42 +0000 (00:23 -0700)]
Missing return statement if a print job is no longer present.
bug:
11012251
Change-Id: I2ea925d903571aa676e4c48d78b4c0c6a91d7af1
Alon Albert [Tue, 1 Oct 2013 00:08:12 +0000 (17:08 -0700)]
Hide Camera in CryptKeeper
Bug:
10993393
Change-Id: Idaddd01f099ae40283eb86fd92232845f9d436b8
Svetoslav [Tue, 1 Oct 2013 00:24:33 +0000 (00:24 +0000)]
Merge "Show appropriate empty state if not printers are found." into klp-dev
Dianne Hackborn [Tue, 1 Oct 2013 00:10:56 +0000 (17:10 -0700)]
am
768dc8f7: Merge "Fix issue #
10948509: Crash in procstats when there is no data" into klp-dev
* commit '
768dc8f7293356cdada32a13a476c7477f0bb126':
Fix issue #
10948509: Crash in procstats when there is no data
Alan Viverette [Tue, 1 Oct 2013 00:09:28 +0000 (17:09 -0700)]
am
77165f6d: Merge "Restore default locale in Captioning Settings" into klp-dev
* commit '
77165f6d4bee9d367cb6e70a266645e1e755f3c6':
Restore default locale in Captioning Settings
Amith Yamasani [Tue, 1 Oct 2013 00:09:20 +0000 (17:09 -0700)]
am
c26f2615: am
8cfce5de: (-s ours) am
da0e4483: am
aad8d90c: am
b4881f79: am
451d8225: am
49187c94: am
53a56ad8: am
447415f4: am
78708503: am
77aa51e5: Make sure that external callers cannot pass in the confirm bypass extra
* commit '
c26f2615964b648515c86cac08b492cee19b0747':
Make sure that external callers cannot pass in the confirm bypass extra
Russell Brenner [Tue, 1 Oct 2013 00:09:00 +0000 (17:09 -0700)]
am
93e6a023: Merge "Set divider color for light theme" into klp-dev
* commit '
93e6a023c5d6ce0f7f79e40c1385c06b0c0135ea':
Set divider color for light theme
Martijn Coenen [Tue, 1 Oct 2013 00:08:54 +0000 (17:08 -0700)]
am
86f74d2a: Merge "Tap & pay: change empty state UX and strings." into klp-dev
* commit '
86f74d2ad407214e23a717f2f24046ce9a89ea48':
Tap & pay: change empty state UX and strings.
Svetoslav [Tue, 1 Oct 2013 00:07:14 +0000 (17:07 -0700)]
am
8181c816: Merge "Add icons to the printer list items in settings." into klp-dev
* commit '
8181c8166f2dcd74fab0c422edf02e0ff7148fe5':
Add icons to the printer list items in settings.
Lifu Tang [Tue, 1 Oct 2013 00:06:52 +0000 (17:06 -0700)]
am
4ba66781: Merge "Hacked to display Puzzle icon for GCore" into klp-dev
* commit '
4ba66781f30c7d96274bbf4b6395838495fea399':
Hacked to display Puzzle icon for GCore
Lifu Tang [Tue, 1 Oct 2013 00:06:51 +0000 (17:06 -0700)]
am
2f78d82a: Merge "Don\'t show help menu when browser unavailable" into klp-dev
* commit '
2f78d82ab3a2858b3265cf01099db455fb43f4b1':
Don't show help menu when browser unavailable
Svetoslav [Mon, 30 Sep 2013 23:41:08 +0000 (23:41 +0000)]
Merge "Remove Google Play specific search URIs from Settings." into klp-dev
Svetoslav [Mon, 30 Sep 2013 23:22:29 +0000 (16:22 -0700)]
Show appropriate empty state if not printers are found.
One can search for printers in the print service settings
and we need to show appropriate empty state if none is found.
bug:
11009053
Change-Id: If3ed6aa3a5e2eb4d7f7bae37f885e4b8eb0909b4
Svetoslav [Mon, 30 Sep 2013 22:59:43 +0000 (15:59 -0700)]
Remove Google Play specific search URIs from Settings.
1. If there are no installed print services or NFC payment services,
we would like to allow the user to search for one in Play. However,
Play is Google specific and we should not have hard coded URI that
rely on it in settings. Declare secure settings for each of these
URI and check at runtime if the URI is non-empty, then show the
add menu item.
bug:
11011519
Change-Id: I2c5cb172015bbecd7d2f8ffd3cb7fd790b01dab8
Jim Miller [Mon, 30 Sep 2013 20:38:09 +0000 (20:38 +0000)]
Merge "Disable keyguard widgets on low memory devices" into klp-dev
Jim Miller [Sun, 29 Sep 2013 21:04:40 +0000 (14:04 -0700)]
Disable keyguard widgets on low memory devices
Fixes bug
10784493
Change-Id: Idc1c35faf0715814fa1a257319888945c82527c6
David Christie [Mon, 30 Sep 2013 20:19:00 +0000 (20:19 +0000)]
Merge "Change location settings "Device sensors" to "Device only" (b/
10992469). Note this is the minimum change for things visible to the user. I double checked the accessibility string description and it is still valid as is (it says "Use GPS to pinpoint your location"). We can also change the internal code variable names to not say "sensors" but I would suggest doing this after KLP as is a noop in UI." into klp-dev
David Christie [Mon, 30 Sep 2013 18:22:08 +0000 (11:22 -0700)]
Change location settings "Device sensors" to "Device only" (b/
10992469).
Note this is the minimum change for things visible to the user.
I double checked the accessibility string description and it is still
valid as is (it says "Use GPS to pinpoint your location").
We can also change the internal code variable names to not say "sensors"
but I would suggest doing this after KLP as is a noop in UI.
Change-Id: I2f747a42388a82e30c59b4b6e91849c5d590e1af
Martijn Coenen [Mon, 30 Sep 2013 19:11:52 +0000 (19:11 +0000)]
Merge "Don't show tap&pay if NFC is off." into klp-dev
Martijn Coenen [Mon, 30 Sep 2013 19:07:02 +0000 (12:07 -0700)]
Don't show tap&pay if NFC is off.
Bug:
11007036
Change-Id: Ie19609fa928b2806c76b8bd94cdfd1872b9da032
Matthew Xie [Mon, 30 Sep 2013 18:57:15 +0000 (18:57 +0000)]
Merge "Add Bluetooth Privileged permission to use pairing apis" into klp-dev