Lifu Tang
29557e64d2
am 2f78d82a
: Merge "Don\'t show help menu when browser unavailable" into klp-dev
...
* commit '2f78d82ab3a2858b3265cf01099db455fb43f4b1':
Don't show help menu when browser unavailable
2013-09-30 14:13:20 -07:00
Jim Miller
277827fb27
Merge "Disable keyguard widgets on low memory devices" into klp-dev
2013-09-30 20:38:10 +00:00
Jim Miller
0366d14fb8
Disable keyguard widgets on low memory devices
...
Fixes bug 10784493
Change-Id: Idc1c35faf0715814fa1a257319888945c82527c6
2013-09-30 13:27:39 -07:00
David Christie
7cdb34f50e
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
2013-09-30 20:19:00 +00:00
David Christie
07301cf157
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
2013-09-30 12:33:09 -07:00
Martijn Coenen
028b6b3f7c
Merge "Don't show tap&pay if NFC is off." into klp-dev
2013-09-30 19:11:52 +00:00
Martijn Coenen
81ab81778b
Don't show tap&pay if NFC is off.
...
Bug: 11007036
Change-Id: Ie19609fa928b2806c76b8bd94cdfd1872b9da032
2013-09-30 12:07:02 -07:00
Matthew Xie
3b2fbe2fb3
Merge "Add Bluetooth Privileged permission to use pairing apis" into klp-dev
2013-09-30 18:57:15 +00:00
Vinit Deshapnde
6c0a193050
Fix EAP-TLS reconnect after reboot issue
...
After a reboot, KeyStore is locked, and certificates encrypted with user
PIN are not accessible. So statemachines are not able to connect to
EAP-TLS networks. This change makes the problem less severe by
1. Not signing certificates with user PIN on devices with hardware backed
KeyStore.
2. Issuing a reconnect upon first USER_PRESENT event.
This means HH (which has a hardware backed keystore) will connect to
EAP-TLS networks without requiring user intervention; and other devices
will automatically connect to those networks after user punches PIN.
Bug: 10325089
Change-Id: I023d60e58d8214152f051bd9ec84b85b702d829a
2013-09-30 10:41:39 -07:00
The Android Automerger
08be396aa0
merge in klp-release history after reset to klp-dev
2013-09-30 06:00:40 -07:00
Dianne Hackborn
768dc8f729
Merge "Fix issue #10948509 : Crash in procstats when there is no data" into klp-dev
2013-09-30 00:22:01 +00:00
Dianne Hackborn
5635594c38
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
2013-09-29 17:07:49 -07:00
The Android Automerger
88e7aaca92
merge in klp-release history after reset to klp-dev
2013-09-29 06:01:41 -07:00
Alan Viverette
77165f6d4b
Merge "Restore default locale in Captioning Settings" into klp-dev
2013-09-27 23:13:05 +00:00
Amith Yamasani
c26f261596
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
2013-09-27 15:58:09 -07:00
Russell Brenner
93e6a023c5
Merge "Set divider color for light theme" into klp-dev
2013-09-27 22:41:33 +00:00
Martijn Coenen
86f74d2ad4
Merge "Tap & pay: change empty state UX and strings." into klp-dev
2013-09-27 22:37:37 +00:00
Martijn Coenen
b412e18296
Tap & pay: change empty state UX and strings.
...
Bug: 10965661
Change-Id: Iee0b8bf111ef2105babb0912942f5c764b75ac59
2013-09-27 14:51:46 -07:00
Alan Viverette
c402322a5b
Restore default locale in Captioning Settings
...
BUG: 10967083
Change-Id: Id607a108d3d56a89fcecf345d2e12af88dc38690
2013-09-27 12:22:34 -07:00
Amith Yamasani
8cfce5de83
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 'da0e448379ff4bcc778fbbe1f203ec322378244f':
Make sure that external callers cannot pass in the confirm bypass extra
2013-09-27 11:55:35 -07:00
Amith Yamasani
da0e448379
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 'aad8d90ce082d01e6420227572891a2fce65306a':
Make sure that external callers cannot pass in the confirm bypass extra
2013-09-27 11:51:16 -07:00
Amith Yamasani
aad8d90ce0
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 'b4881f79e1c065b40f234710b6fb28acce9e164f':
Make sure that external callers cannot pass in the confirm bypass extra
2013-09-27 11:46:25 -07:00
Mindy Pereira
28600d29f3
Updated de-blued backgrounds for settings power widget.
...
Change-Id: I940999244d7bb6c2ec800c16b3c55c266d9b70c9
2013-09-27 11:31:04 -07:00
Amith Yamasani
b4881f79e1
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 '451d8225ef3ae407f52512a93bcf04e6400eb997':
Make sure that external callers cannot pass in the confirm bypass extra
2013-09-27 11:27:47 -07:00
Amith Yamasani
451d8225ef
am 49187c94
: am 53a56ad8
: am 447415f4
: am 78708503
: am 77aa51e5
: Make sure that external callers cannot pass in the confirm bypass extra
...
* commit '49187c9418dc2c5f404385596db3d82dd896c178':
Make sure that external callers cannot pass in the confirm bypass extra
2013-09-27 11:24:28 -07:00
Amith Yamasani
49187c9418
am 53a56ad8
: am 447415f4
: am 78708503
: am 77aa51e5
: Make sure that external callers cannot pass in the confirm bypass extra
...
* commit '53a56ad89cbd14410dcd8e5755c6765f1a438928':
Make sure that external callers cannot pass in the confirm bypass extra
2013-09-27 11:20:20 -07:00
Amith Yamasani
53a56ad89c
am 447415f4
: am 78708503
: am 77aa51e5
: Make sure that external callers cannot pass in the confirm bypass extra
...
* commit '447415f4f17dc91d3844394625f4e6fa10efedad':
Make sure that external callers cannot pass in the confirm bypass extra
2013-09-27 11:18:04 -07:00
Amith Yamasani
447415f4f1
am 78708503
: am 77aa51e5
: Make sure that external callers cannot pass in the confirm bypass extra
...
* commit '7870850387dabd32a54e3fca7d65dea5f45a9a16':
Make sure that external callers cannot pass in the confirm bypass extra
2013-09-27 11:14:30 -07:00
Amith Yamasani
7870850387
am 77aa51e5
: Make sure that external callers cannot pass in the confirm bypass extra
...
* commit '77aa51e5b7261638590af1d69ac03f4c8cd25692':
Make sure that external callers cannot pass in the confirm bypass extra
2013-09-27 11:10:37 -07:00
Svetoslav
8181c8166f
Merge "Add icons to the printer list items in settings." into klp-dev
2013-09-27 02:25:36 +00:00
Svetoslav
a749adae03
Add icons to the printer list items in settings.
...
bug:10955751
Change-Id: Iea87a9a07624d6e26274030a51f912f8d2ef0e10
2013-09-26 18:56:27 -07:00
Lifu Tang
4ba66781f3
Merge "Hacked to display Puzzle icon for GCore" into klp-dev
2013-09-27 00:18:22 +00:00
Lifu Tang
2f78d82ab3
Merge "Don't show help menu when browser unavailable" into klp-dev
2013-09-27 00:17:54 +00:00
Svetoslav Ganov
b4c83de0b3
Add print job settings screen.
...
Added a list of active print jobs to the main print settings
screen. Selecting a print job from there leads to a print job
settings screen with more information about the print job and
actions to change the prit job state such as cancel and restart.
bug:10935736
Change-Id: Idd6826a998309941c3d8478dafe4b039c8ca4f45
Conflicts:
res/values/donottranslate.xml
2013-09-26 16:38:31 -07:00
Russell Brenner
2ef377d47d
Set divider color for light theme
...
Bug: 10928581
Change-Id: I5586cae0ef2c49f5297f94bb7fb6ddede9d64b76
2013-09-26 16:07:52 -07:00
Svetoslav Ganov
40f946ad89
am 2a2fcdd6
: am bc2c3db8
: Add print job settings screen.
...
* commit '2a2fcdd6dbeee06af8acca7c76fbe905c862cbd4':
Add print job settings screen.
2013-09-26 14:18:21 -07:00
Svetoslav Ganov
2a2fcdd6db
am bc2c3db8
: Add print job settings screen.
...
* commit 'bc2c3db8f923b9ee25345f5ebbad9f6c762a1e23':
Add print job settings screen.
2013-09-26 14:14:55 -07:00
Svetoslav Ganov
bc2c3db8f9
Add print job settings screen.
...
Added a list of active print jobs to the main print settings
screen. Selecting a print job from there leads to a print job
settings screen with more information about the print job and
actions to change the prit job state such as cancel and restart.
bug:10935736
Change-Id: Idd6826a998309941c3d8478dafe4b039c8ca4f45
2013-09-26 13:58:59 -07:00
Martijn Coenen
9ccde1132c
am 01aa7930
: am 077f83a2
: Merge "Latest UX for Tap & pay." into klp-dev
...
* commit '01aa7930306e15ba4ce942844506e42df85a0a04':
Latest UX for Tap & pay.
2013-09-26 11:05:48 -07:00
Lifu Tang
9335f14082
Hacked to display Puzzle icon for GCore
...
- Fix b/10856957
Change-Id: I0716c9f5c6d818cd38dfc30a6b0b29deaa994367
2013-09-26 11:01:14 -07:00
Martijn Coenen
01aa793030
am 077f83a2
: Merge "Latest UX for Tap & pay." into klp-dev
...
* commit '077f83a22c3d9b8650b2ba4dab4f17e55fde59fb':
Latest UX for Tap & pay.
2013-09-26 11:00:49 -07:00
Martijn Coenen
077f83a22c
Merge "Latest UX for Tap & pay." into klp-dev
2013-09-26 17:57:47 +00:00
Mindy Pereira
2da0c7cc14
am ff91e56f
: am 873c3723
: Merge "Updated de-blued backgrounds for settings power widget." into klp-dev
...
* commit 'ff91e56f8b17f4f986dd5512c3e7444875f2427f':
Updated de-blued backgrounds for settings power widget.
2013-09-26 10:52:26 -07:00
Mindy Pereira
ff91e56f8b
am 873c3723
: Merge "Updated de-blued backgrounds for settings power widget." into klp-dev
...
* commit '873c3723233f3fffd2ccd58041579bcd454d1e55':
Updated de-blued backgrounds for settings power widget.
2013-09-26 10:50:51 -07:00
Mindy Pereira
873c372323
Merge "Updated de-blued backgrounds for settings power widget." into klp-dev
2013-09-26 17:49:40 +00:00
The Android Automerger
2e85c354b0
merge in klp-release history after reset to klp-dev
2013-09-26 06:02:03 -07:00
Baligh Uddin
feecc86691
Merge "Import translations. DO NOT MERGE"
2013-09-26 04:03:25 +00:00
Baligh Uddin
ac9b068726
Import translations. DO NOT MERGE
...
Change-Id: I8dc4ee767b10e74fa862573130e163c3a451c152
Auto-generated-cl: translation import
2013-09-25 20:31:24 -07:00
Lifu Tang
66d879ce9f
Don't show help menu when browser unavailable
...
- Fix b/10860551
Change-Id: I71d073ef96d406f1705672d7ccf75337e5250ec6
2013-09-25 17:49:00 -07:00
Amith Yamasani
77aa51e5b7
Make sure that external callers cannot pass in the confirm bypass extra
...
Security fix for vulnerability where an app could launch into the screen lock
change dialog without first confirming the existing password/pattern.
Also, make sure that the fragments are launched with the correct corresponding
activity.
Bug: 9858403
Change-Id: I0f2c00a44abeb624c6fba0497bf6036a6f1a4564
2013-09-25 17:11:34 -07:00