OSDN Git Service
Svetoslav [Thu, 3 Oct 2013 01:37:13 +0000 (18:37 -0700)]
Fix settings title
Change-Id: I203c577693700ef60197800632e8c33bc552ef5f
Svetoslav [Thu, 3 Oct 2013 01:24:25 +0000 (18:24 -0700)]
am
e60a06b0: (-s ours) am
672b845e: Merge "Polish print settings accessibility." into klp-dev
* commit '
e60a06b0e750e5dfa5a011c5863a385d314203c4':
Polish print settings accessibility.
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.
Svetoslav [Wed, 2 Oct 2013 23:48:07 +0000 (23:48 +0000)]
Merge "Polish print settings accessibility." into klp-dev
Alan Viverette [Wed, 2 Oct 2013 23:39:37 +0000 (23:39 +0000)]
Merge "Add accessibility display adjustments to Settings"
Alan Viverette [Wed, 2 Oct 2013 23:36:33 +0000 (16:36 -0700)]
Add accessibility display adjustments to Settings
This will be redesigned soon, but for now it allows access to quick
setting tiles for testing display adjustments.
BUG:
9057596
Change-Id: I4b760487b2fe0a336b188930306000e5dfc01951
Christopher Tate [Wed, 2 Oct 2013 22:18:22 +0000 (15:18 -0700)]
am
73f5f2aa: am
e7358028: Merge "Back out of Home settings when penultimate home app is uninstalled" into klp-dev
* commit '
73f5f2aac9a3731be1cfc8f0267c19df876fcfe6':
Back out of Home settings when penultimate home app is uninstalled
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
Lifu Tang [Wed, 2 Oct 2013 22:12:28 +0000 (15:12 -0700)]
am
a310b638: am
3846b539: Merge "Modified suggestion string for battery-saving mode" into klp-dev
* commit '
a310b6382dd4f80af27a0d8673ee5cae270ff4ad':
Modified suggestion string for battery-saving mode
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:31:10 +0000 (14:31 -0700)]
am
3f60d8d3: am
d462e868: Merge "Load account type icons in a background thread before scrolling down" into klp-dev
* commit '
3f60d8d395545f11b63a936cf776f6ab6bae953b':
Load account type icons in a background thread before scrolling down
David Braun [Wed, 2 Oct 2013 21:31:10 +0000 (14:31 -0700)]
am
fdbb26c8: am
6e5956eb: Merge "Default SMS app setting should still be shown even if SIM is removed." into klp-dev
* commit '
fdbb26c8af09054e515784b15c258812da888fca':
Default SMS app setting should still be shown even if SIM is removed.
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
Daniel Sandler [Wed, 2 Oct 2013 19:13:08 +0000 (19:13 +0000)]
Merge "Longpress any row in Status to copy text to the clipboard."
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:56:29 +0000 (09:56 -0700)]
am
1426c36f: am
ff75201a: Merge "Missing return statement if a print job is no longer present." into klp-dev
* commit '
1426c36ff9d377cdf843940f2ecd0bbab07a9cbb':
Missing return statement if a print job is no longer present.
Lifu Tang [Wed, 2 Oct 2013 16:56:28 +0000 (09:56 -0700)]
am
615a6da4: am
c120c6cf: Fixed crash when rotating screen
* commit '
615a6da493d4f9ef4ae7d8f43d495a1272aefed8':
Fixed crash when rotating screen
Lifu Tang [Wed, 2 Oct 2013 16:56:27 +0000 (09:56 -0700)]
am
e6e459a1: am
5ab9fa43: Renamed "App settings" back to "Location services"
* commit '
e6e459a105444b743683fd68319424be6eb3e005':
Renamed "App settings" back to "Location services"
Lifu Tang [Wed, 2 Oct 2013 16:56:27 +0000 (09:56 -0700)]
am
66689fa9: am
c6578818: Merge "Make recent location app list package based" into klp-dev
* commit '
66689fa96429c421fcbbf08381dce7392f845814':
Make recent location app list package based
Alon Albert [Wed, 2 Oct 2013 16:56:26 +0000 (09:56 -0700)]
am
c580a279: am
394b80ce: Merge "Hide Camera in CryptKeeper" into klp-dev
* commit '
c580a279a6bf5f666a876ff6a111abb3400a5831':
Hide Camera in CryptKeeper
Maggie Benthall [Wed, 2 Oct 2013 16:56:25 +0000 (09:56 -0700)]
am
66ef8141: am
490e072c: Merge "UX tweaks for CA cert monitoring" into klp-dev
* commit '
66ef8141f38e75373940cc1666b530f944e1f56b':
UX tweaks for CA cert monitoring
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 06:10:33 +0000 (23:10 -0700)]
am
1b0a7119: am
1b881bcc: Merge "Show appropriate empty state if not printers are found." into klp-dev
* commit '
1b0a71197f3629cebf4b354b6db835774b1276dc':
Show appropriate empty state if not printers are found.
Svetoslav [Wed, 2 Oct 2013 06:10:32 +0000 (23:10 -0700)]
am
9d0c0b2f: am
033b5739: Merge "Remove Google Play specific search URIs from Settings." into klp-dev
* commit '
9d0c0b2fecc84ea6c6e156be9d87f2f6e26b012b':
Remove Google Play specific search URIs from Settings.
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.
Daniel Sandler [Wed, 2 Oct 2013 04:16:19 +0000 (00:16 -0400)]
Longpress any row in Status to copy text to the clipboard.
Really convenient for grabbing IMEI/MAC/serial/etc.
Change-Id: I30dd6109d76f342108b10571cf043158b09743d0
Jim Miller [Wed, 2 Oct 2013 03:59:19 +0000 (20:59 -0700)]
am
3e82dff1: am
277827fb: Merge "Disable keyguard widgets on low memory devices" into klp-dev
* commit '
3e82dff1a112a5e231f82f8ccc15a5fe248e9be6':
Disable keyguard widgets on low memory devices
David Christie [Wed, 2 Oct 2013 03:59:19 +0000 (20:59 -0700)]
am
d0217f0f: 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 GP
* commit '
d0217f0f88a692519a95768321c3923e97032530':
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 [Wed, 2 Oct 2013 03:59:18 +0000 (20:59 -0700)]
am
e1f522ad: am
028b6b3f: Merge "Don\'t show tap&pay if NFC is off." into klp-dev
* commit '
e1f522ad4bac2d39bcaddf60a91256e15d9ab942':
Don't show tap&pay if NFC is off.
Matthew Xie [Wed, 2 Oct 2013 03:59:17 +0000 (20:59 -0700)]
am
c9320341: am
3b2fbe2f: Merge "Add Bluetooth Privileged permission to use pairing apis" into klp-dev
* commit '
c9320341e458b02c1700f167c8036d51790cc795':
Add Bluetooth Privileged permission to use pairing apis
Dianne Hackborn [Wed, 2 Oct 2013 03:59:17 +0000 (20:59 -0700)]
am
d0ebb052: am
768dc8f7: Merge "Fix issue #
10948509: Crash in procstats when there is no data" into klp-dev
* commit '
d0ebb0520c64e717948d3bd98f0eb53c15828f94':
Alan Viverette [Wed, 2 Oct 2013 03:59:16 +0000 (20:59 -0700)]
am
1e33aac9: am
77165f6d: Merge "Restore default locale in Captioning Settings" into klp-dev
* commit '
1e33aac9ef0a731b05297f87e7318a68d074c13b':
Amith Yamasani [Wed, 2 Oct 2013 03:59:15 +0000 (20:59 -0700)]
am
3a7eb5f1: 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 '
3a7eb5f1a8f1ef3821af41f45a75d8e29f58f57a':
Russell Brenner [Wed, 2 Oct 2013 03:59:15 +0000 (20:59 -0700)]
am
1bfd66c4: am
93e6a023: Merge "Set divider color for light theme" into klp-dev
* commit '
1bfd66c4482506fab36a5e1c130cf7b517e3e62d':
Martijn Coenen [Wed, 2 Oct 2013 03:59:14 +0000 (20:59 -0700)]
am
c432a712: am
86f74d2a: Merge "Tap & pay: change empty state UX and strings." into klp-dev
* commit '
c432a712274833222e42629d88fcda865842ec55':
Svetoslav [Wed, 2 Oct 2013 03:59:13 +0000 (20:59 -0700)]
am
88cd02bb: am
8181c816: Merge "Add icons to the printer list items in settings." into klp-dev
* commit '
88cd02bbce36576b9402ee136fb87df4965a0d24':
Lifu Tang [Wed, 2 Oct 2013 03:59:12 +0000 (20:59 -0700)]
am
36f50e81: am
4ba66781: Merge "Hacked to display Puzzle icon for GCore" into klp-dev
* commit '
36f50e81096c665ad112b39a143c1e91fd521c8a':
Lifu Tang [Wed, 2 Oct 2013 03:59:12 +0000 (20:59 -0700)]
am
0cdba449: am
2f78d82a: Merge "Don\'t show help menu when browser unavailable" into klp-dev
* commit '
0cdba4493b7c5215ecf931255331455fdee882ce':
Dianne Hackborn [Wed, 2 Oct 2013 01:45:12 +0000 (18:45 -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
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
Alan Viverette [Mon, 30 Sep 2013 21:17:19 +0000 (14:17 -0700)]
am
77165f6d: Merge "Restore default locale in Captioning Settings" into klp-dev
* commit '
77165f6d4bee9d367cb6e70a266645e1e755f3c6':
Restore default locale in Captioning Settings
Amith Yamasani [Mon, 30 Sep 2013 21:17:12 +0000 (14:17 -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 [Mon, 30 Sep 2013 21:16:45 +0000 (14:16 -0700)]
am
93e6a023: Merge "Set divider color for light theme" into klp-dev
* commit '
93e6a023c5d6ce0f7f79e40c1385c06b0c0135ea':
Set divider color for light theme
Martijn Coenen [Mon, 30 Sep 2013 21:16:40 +0000 (14:16 -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 [Mon, 30 Sep 2013 21:13:49 +0000 (14:13 -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 [Mon, 30 Sep 2013 21:13:20 +0000 (14:13 -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 [Mon, 30 Sep 2013 21:13:20 +0000 (14:13 -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
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
Dianne Hackborn [Mon, 30 Sep 2013 00:22:01 +0000 (00:22 +0000)]
Merge "Fix issue #
10948509: Crash in procstats when there is no data" into klp-dev
Dianne Hackborn [Mon, 30 Sep 2013 00:07:49 +0000 (17:07 -0700)]
Fix issue #
10948509: Crash in procstats when there is no data
Also make us much better about determining which app to blame for
a particular running process, organize the display of services by
their owning app, apply some new heuristics for deciding what goes
in the process list so that we can still display interesting processes
when we haven't collected pss data for them yet, etc.
Change-Id: I7e87225d3dabc66cf3ff020b5db48401b14aaf47
Alan Viverette [Fri, 27 Sep 2013 23:13:04 +0000 (23:13 +0000)]
Merge "Restore default locale in Captioning Settings" into klp-dev
Amith Yamasani [Fri, 27 Sep 2013 22:58:09 +0000 (15:58 -0700)]
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 '
8cfce5de838fb9599b1040840f6bbe164bf9afdb':
Make sure that external callers cannot pass in the confirm bypass extra
Russell Brenner [Fri, 27 Sep 2013 22:41:33 +0000 (22:41 +0000)]
Merge "Set divider color for light theme" into klp-dev
Martijn Coenen [Fri, 27 Sep 2013 22:37:37 +0000 (22:37 +0000)]
Merge "Tap & pay: change empty state UX and strings." into klp-dev
Martijn Coenen [Fri, 27 Sep 2013 21:49:47 +0000 (14:49 -0700)]
Tap & pay: change empty state UX and strings.
Bug:
10965661
Change-Id: Iee0b8bf111ef2105babb0912942f5c764b75ac59
OSDN Git Service
