Barnaby James
8968ba2785
am d4c613e9: am cea2cf43: am 9331b9fa: Merge "Simplify Zen mode voice activity." into mnc-dev
...
* commit 'd4c613e9970b174d0295b177c23033bab413034c':
Simplify Zen mode voice activity.
2015-05-11 19:23:44 +00:00
Barnaby James
d4c613e997
am cea2cf43: am 9331b9fa: Merge "Simplify Zen mode voice activity." into mnc-dev
...
* commit 'cea2cf43c49d858366c872b5e0696368fec2e9fd':
Simplify Zen mode voice activity.
2015-05-11 18:41:50 +00:00
Barnaby James
cea2cf43c4
am 9331b9fa: Merge "Simplify Zen mode voice activity." into mnc-dev
...
* commit '9331b9fa0d416b80423b1200a80349be77463c65':
Simplify Zen mode voice activity.
2015-05-11 18:26:36 +00:00
Barnaby James
9331b9fa0d
Merge "Simplify Zen mode voice activity." into mnc-dev
2015-05-11 18:15:03 +00:00
Geoff Mendal
20f8d71cc0
am 1e14cff9: (-s ours) am 671371e5: (-s ours) am bff0f290: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit '1e14cff96a363d7c36c606a0bb498cb5195093fd':
Import translations. DO NOT MERGE
2015-05-11 16:38:33 +00:00
Geoff Mendal
1e14cff96a
am 671371e5: (-s ours) am bff0f290: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit '671371e5b4e5ceadbca289bc260be31c67529957':
Import translations. DO NOT MERGE
2015-05-11 16:28:33 +00:00
Barnaby James
0474b723e1
Simplify Zen mode voice activity.
...
Zen mode voice activity now only sets the notification mode to alarms mode
or off. A duration may be specified if it was in the original intent.
Change-Id: Ica472ca9c6dcbce473832f4f922baf225df4951b
Bug: 21024455
2015-05-11 09:20:54 -07:00
John Spurlock
91070afa12
am 62fe0df1: am 88be59ea: am b8099f54: Settings: Migrate notification access screens to switch prefs.
...
* commit '62fe0df138b9987f827e46254aebfc4561b55a2d':
Settings: Migrate notification access screens to switch prefs.
2015-05-11 16:18:13 +00:00
Geoff Mendal
671371e5b4
am bff0f290: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit 'bff0f2905fd8128f49ff78bd9f15e81e97281c91':
Import translations. DO NOT MERGE
2015-05-11 16:14:58 +00:00
Geoff Mendal
bff0f2905f
Merge "Import translations. DO NOT MERGE" into mnc-dev
2015-05-11 16:10:13 +00:00
John Spurlock
62fe0df138
am 88be59ea: am b8099f54: Settings: Migrate notification access screens to switch prefs.
...
* commit '88be59ea389d39891ab93a6426300ecce509a971':
Settings: Migrate notification access screens to switch prefs.
2015-05-11 16:09:09 +00:00
John Spurlock
88be59ea38
am b8099f54: Settings: Migrate notification access screens to switch prefs.
...
* commit 'b8099f542c21e3ac57d250837e60ec65653ab55c':
Settings: Migrate notification access screens to switch prefs.
2015-05-11 15:58:51 +00:00
John Spurlock
b8099f542c
Settings: Migrate notification access screens to switch prefs.
...
Bug: 20916418
Change-Id: I729bc3a6f853f15780f12e7d7c9f337447e399c4
2015-05-11 11:47:21 -04:00
Chris Wren
2e19e3b391
am 57228e26: am cf3b4e2e: am 46c8f759: Merge "log more settings actions" into mnc-dev
...
* commit '57228e2639fb9c48f6763521ae358da4cf0254fc':
log more settings actions
2015-05-11 15:40:05 +00:00
Chris Wren
57228e2639
am cf3b4e2e: am 46c8f759: Merge "log more settings actions" into mnc-dev
...
* commit 'cf3b4e2edcafae8918392497a323f561ca94f76f':
log more settings actions
2015-05-11 15:28:04 +00:00
Chris Wren
cf3b4e2edc
am 46c8f759: Merge "log more settings actions" into mnc-dev
...
* commit '46c8f759fdad71380504ad61a49031331ea39004':
log more settings actions
2015-05-11 15:17:15 +00:00
Chris Wren
46c8f759fd
Merge "log more settings actions" into mnc-dev
2015-05-11 15:07:18 +00:00
Geoff Mendal
98f714c719
Import translations. DO NOT MERGE
...
Change-Id: I57e694a0f716f9c8a45493cd1b4a2ad9d6d4a7ef
Auto-generated-cl: translation import
2015-05-11 07:50:14 -07:00
Geoff Mendal
9d8d5fe3e4
Import translations. DO NOT MERGE
...
Change-Id: I7777ee2e12e3d148ecc42f211cd7a388ad8509c6
Auto-generated-cl: translation import
2015-05-11 07:13:25 -07:00
Maurice Lam
8a52c565f8
am 1008c12b: am 0d0d8e25: am 69a03f75: Merge "[LockScreenSetup] Fix "Choose Lock PIN" title" into mnc-dev
...
* commit '1008c12b365b2bfa54e896c859e8bac2fb686d23':
[LockScreenSetup] Fix "Choose Lock PIN" title
2015-05-09 00:28:00 +00:00
Maurice Lam
1008c12b36
am 0d0d8e25: am 69a03f75: Merge "[LockScreenSetup] Fix "Choose Lock PIN" title" into mnc-dev
...
* commit '0d0d8e25916f5765cc37c28332a8a1e341dbd518':
[LockScreenSetup] Fix "Choose Lock PIN" title
2015-05-09 00:21:31 +00:00
Maurice Lam
0d0d8e2591
am 69a03f75: Merge "[LockScreenSetup] Fix "Choose Lock PIN" title" into mnc-dev
...
* commit '69a03f75171c9f21ee4517f8e6d02cfa955c6a84':
[LockScreenSetup] Fix "Choose Lock PIN" title
2015-05-09 00:10:53 +00:00
Maurice Lam
69a03f7517
Merge "[LockScreenSetup] Fix "Choose Lock PIN" title" into mnc-dev
2015-05-09 00:04:32 +00:00
Sanket Padawe
4048110b74
am bb575513: am 7e8b3541: am d7cba372: Merge "Fix Signal strength display issue in Settings." into mnc-dev
...
* commit 'bb5755138c7bc4acf0178e9178d0e4c7f4f906c5':
Fix Signal strength display issue in Settings.
2015-05-08 23:55:41 +00:00
Sanket Padawe
bb5755138c
am 7e8b3541: am d7cba372: Merge "Fix Signal strength display issue in Settings." into mnc-dev
...
* commit '7e8b35411e80fd3a77d27e43233aa03a7c0fc89c':
Fix Signal strength display issue in Settings.
2015-05-08 23:47:47 +00:00
Sanket Padawe
7e8b35411e
am d7cba372: Merge "Fix Signal strength display issue in Settings." into mnc-dev
...
* commit 'd7cba372c6cdeeb8da74de0ae60a2b30ab5f4e25':
Fix Signal strength display issue in Settings.
2015-05-08 23:41:30 +00:00
Sanket Padawe
d7cba372c6
Merge "Fix Signal strength display issue in Settings." into mnc-dev
2015-05-08 23:32:48 +00:00
Sanket Padawe
afee3aa5ab
Fix Signal strength display issue in Settings.
...
Bug: 20821065
Change-Id: Ib98e7b80f5ee331ef0adb8df706bb697f9fff008
2015-05-08 16:31:35 -07:00
John Spurlock
fa222c5289
am 2d532ec3: am ec811217: am 3c4bf826: Merge "Settings: Use new EventInfo.ANY_CALENDAR constant." into mnc-dev
...
* commit '2d532ec36fa10752e5dda766543865ff537e1351':
Settings: Use new EventInfo.ANY_CALENDAR constant.
2015-05-08 22:48:38 +00:00
John Spurlock
7cb6fe5c59
am 752acc16: am d068dba8: am 7b998977: Merge "Settings: New DND access settings page." into mnc-dev
...
* commit '752acc16112502ed2011d0236d516d655539278e':
Settings: New DND access settings page.
2015-05-08 22:48:37 +00:00
Chris Wren
1b6ffba9e6
log more settings actions
...
airplane mode
bluetooth
cell data
do not disturb
Bug: 20264417
Change-Id: I726033a126fba9f9dffc916806d636feea04033b
2015-05-08 18:48:24 -04:00
John Spurlock
2d532ec36f
am ec811217: am 3c4bf826: Merge "Settings: Use new EventInfo.ANY_CALENDAR constant." into mnc-dev
...
* commit 'ec81121770aa89c18c0e114e4c47a399b2c016c9':
Settings: Use new EventInfo.ANY_CALENDAR constant.
2015-05-08 22:46:29 +00:00
John Spurlock
752acc1611
am d068dba8: am 7b998977: Merge "Settings: New DND access settings page." into mnc-dev
...
* commit 'd068dba82a539dbc3b24ad31be3a192c7e4e2ff9':
Settings: New DND access settings page.
2015-05-08 22:46:28 +00:00
Chad Brubaker
9fb71afb73
am 2f23695a: am 1cfc32d1: am 69fb78e2: Merge "Track keystore password method changes" into mnc-dev
...
* commit '2f23695ad523d0577e11e13d52d484f548db4465':
Track keystore password method changes
2015-05-08 22:36:03 +00:00
John Spurlock
ec81121770
am 3c4bf826: Merge "Settings: Use new EventInfo.ANY_CALENDAR constant." into mnc-dev
...
* commit '3c4bf826e704a42ce3d460537a0adf6263c2d503':
Settings: Use new EventInfo.ANY_CALENDAR constant.
2015-05-08 22:35:42 +00:00
John Spurlock
d068dba82a
am 7b998977: Merge "Settings: New DND access settings page." into mnc-dev
...
* commit '7b9989773b1b6ffc415300c095bde51b5c90ff71':
Settings: New DND access settings page.
2015-05-08 22:35:41 +00:00
John Spurlock
3c4bf826e7
Merge "Settings: Use new EventInfo.ANY_CALENDAR constant." into mnc-dev
2015-05-08 22:29:10 +00:00
John Spurlock
7b9989773b
Merge "Settings: New DND access settings page." into mnc-dev
2015-05-08 22:28:55 +00:00
Chad Brubaker
2f23695ad5
am 1cfc32d1: am 69fb78e2: Merge "Track keystore password method changes" into mnc-dev
...
* commit '1cfc32d1a59ab641bcb90425b6c5f2c221f14e23':
Track keystore password method changes
2015-05-08 22:22:03 +00:00
Chad Brubaker
1cfc32d1a5
am 69fb78e2: Merge "Track keystore password method changes" into mnc-dev
...
* commit '69fb78e27b61c91d98a9c90a4680e35e72d0e73c':
Track keystore password method changes
2015-05-08 22:14:04 +00:00
Chad Brubaker
69fb78e27b
Merge "Track keystore password method changes" into mnc-dev
2015-05-08 21:51:12 +00:00
John Spurlock
33bf636e72
Settings: Use new EventInfo.ANY_CALENDAR constant.
...
Bug: 20064962
Change-Id: I08a8c5feb61bfd440fc6a297d97de4abba5b19b3
2015-05-08 17:37:23 -04:00
Jason Monk
e92d8d0789
am 060789f7: am cf2814be: am 173d658b: Merge "Button that goes from app info details to app info" into mnc-dev
...
* commit '060789f76d6a84857ac15f47fb1b2a9e6e2d6391':
Button that goes from app info details to app info
2015-05-08 20:21:28 +00:00
Jason Monk
060789f76d
am cf2814be: am 173d658b: Merge "Button that goes from app info details to app info" into mnc-dev
...
* commit 'cf2814bec405f61b5fa8d652a85e6d743734ecbb':
Button that goes from app info details to app info
2015-05-08 20:10:51 +00:00
Jason Monk
cf2814bec4
am 173d658b: Merge "Button that goes from app info details to app info" into mnc-dev
...
* commit '173d658babe0bcb6add829d1621550cebeed2296':
Button that goes from app info details to app info
2015-05-08 19:58:26 +00:00
Maurice Lam
342c74ed03
[LockScreenSetup] Fix "Choose Lock PIN" title
...
Set the header text for SetupChooseLockPassword in onViewCreated
after the superclass has set the activity title.
Bug: 20861117
Change-Id: I27e4f06d16afd9a02647f8c10a76518f618bd6b8
2015-05-08 12:51:51 -07:00
Jason Monk
173d658bab
Merge "Button that goes from app info details to app info" into mnc-dev
2015-05-08 19:47:29 +00:00
Jason Monk
8f600a4fbc
Button that goes from app info details to app info
...
This info button is shown on the header of all app detail pages.
This button is hidden when coming from app info, to avoid allowing
users to go in circles.
Since app notification details had a settings button where the new
info button goes, the app notification settings will move down to
be a preference (this matches the usage access screen UX).
Also fix a bug in launching app notification settings for managed
profiles.
Bug: 20633669
Change-Id: Idbb4f7c3326b4c6b0a19559b722ee0406eaba6c0
2015-05-08 15:35:46 -04:00
Jason Monk
beb92ce98f
am 8049bfae: am b8555ea9: am 9e1ea4b1: Merge "Choose correct network template for data history" into mnc-dev
...
* commit '8049bfae3f8c0fffb1217e782a1ea5b6755e971f':
Choose correct network template for data history
2015-05-08 18:44:05 +00:00
Jason Monk
8049bfae3f
am b8555ea9: am 9e1ea4b1: Merge "Choose correct network template for data history" into mnc-dev
...
* commit 'b8555ea90afb2ff1271f9a1a396eeb7d54211e71':
Choose correct network template for data history
2015-05-08 18:32:10 +00:00
