Amit Mahajan
1abe5a78b3
Merge "Do not call update() for read only APNs." into oc-dev am: 8f18f8e087
...
am: 563d2d5a29
2017-04-24 22:56:24 +00:00
Daniel Nishi
97686254be
Merge "Fake data to be 0B after clearing." into oc-dev am: cba520fc9d
...
am: 8c6327cfe5
2017-04-24 22:56:01 +00:00
Lei Yu
b4da0a47ab
Merge "Add TtsSpan for formatted time." into oc-dev am: 8f9f25c541
...
am: 8c2a018e77
2017-04-24 22:55:33 +00:00
Lei Yu
7dc19949a4
Merge "Add device name for connect string" into oc-dev am: bcaabec925
...
am: 96cba04e0d
2017-04-24 22:55:09 +00:00
Bartosz Fabianowski
de61f78f68
Only show headers in Master Clear when there are multiple profiles am: 28ec98cd1f
...
am: 154bb00cb0
2017-04-24 22:54:47 +00:00
Amit Mahajan
563d2d5a29
Merge "Do not call update() for read only APNs." into oc-dev
...
am: 8f18f8e087
2017-04-24 22:19:40 +00:00
TreeHugger Robot
8f18f8e087
Merge "Do not call update() for read only APNs." into oc-dev
2017-04-24 22:16:32 +00:00
Daniel Nishi
8c6327cfe5
Merge "Fake data to be 0B after clearing." into oc-dev
...
am: cba520fc9d
2017-04-24 19:44:09 +00:00
Lei Yu
8c2a018e77
Merge "Add TtsSpan for formatted time." into oc-dev
...
am: 8f9f25c541
2017-04-24 19:43:33 +00:00
Lei Yu
96cba04e0d
Merge "Add device name for connect string" into oc-dev
...
am: bcaabec925
2017-04-24 19:43:08 +00:00
Bartosz Fabianowski
154bb00cb0
Only show headers in Master Clear when there are multiple profiles
...
am: 28ec98cd1f
2017-04-24 19:42:34 +00:00
Amit Mahajan
b4ac40b204
Do not call update() for read only APNs.
...
Calling update marks the APN USER_EDITED and thus makes it user
editable.
Test: manual
Bug: 37607890
Change-Id: Ia5aa0df470e04c8bcc58080577cc3da2ab6dc9df
2017-04-24 11:02:03 -07:00
Daniel Nishi
cba520fc9d
Merge "Fake data to be 0B after clearing." into oc-dev
2017-04-24 17:54:20 +00:00
Lei Yu
8f9f25c541
Merge "Add TtsSpan for formatted time." into oc-dev
2017-04-24 17:01:59 +00:00
Lei Yu
bcaabec925
Merge "Add device name for connect string" into oc-dev
2017-04-24 17:00:49 +00:00
Bartosz Fabianowski
28ec98cd1f
Only show headers in Master Clear when there are multiple profiles
...
The Master Clear dialog lists the accounts whose data will be lost by
a factory reset. The list contains the headings "Personal" and "Work"
to distinguish accounts in the main user and the work profile. When
there is no work profile, the header (only "Personal" would be shown in
this case) is superfluous and misleading (as the user may be using the
device for work).
Bug: 30132270
Test: Manual :(
Change-Id: Id493652fc331d4500c4d772a9abcc716995565b3
(cherry picked from commit 30ba868014
2017-04-24 13:51:37 +00:00
Suprabh Shukla
c73508b88d
Merge "Updating strings for Install unknown apps" into oc-dev am: 008a9adef9
...
am: 063bd1d40c
2017-04-22 02:31:44 +00:00
Suprabh Shukla
063bd1d40c
Merge "Updating strings for Install unknown apps" into oc-dev
...
am: 008a9adef9
2017-04-22 02:29:13 +00:00
TreeHugger Robot
008a9adef9
Merge "Updating strings for Install unknown apps" into oc-dev
2017-04-22 02:23:57 +00:00
Ajay Panicker
05d5b83b22
Merge "Add Bluetooth Pairing notifications to a channel" into oc-dev am: 8b09195f80
...
am: 344405d87a
2017-04-22 01:56:42 +00:00
Ajay Panicker
344405d87a
Merge "Add Bluetooth Pairing notifications to a channel" into oc-dev
...
am: 8b09195f80
2017-04-22 01:53:42 +00:00
TreeHugger Robot
8b09195f80
Merge "Add Bluetooth Pairing notifications to a channel" into oc-dev
2017-04-22 01:49:51 +00:00
Matthew Fritze
de03948870
Merge "Remove duplicates between battery and display settings" into oc-dev am: 1c7e25d3b6
...
am: a95fc0f05f
2017-04-22 01:02:39 +00:00
Matthew Fritze
a95fc0f05f
Merge "Remove duplicates between battery and display settings" into oc-dev
...
am: 1c7e25d3b6
2017-04-22 00:59:40 +00:00
TreeHugger Robot
1c7e25d3b6
Merge "Remove duplicates between battery and display settings" into oc-dev
2017-04-22 00:56:09 +00:00
Ajay Panicker
2432051bfd
Add Bluetooth Pairing notifications to a channel
...
Bug: 37531430
Test: Send a pairing request to DUT from remote phone
Change-Id: I2014b0aa3c4797cbf8e601003471372f4920d21d
2017-04-21 16:44:55 -07:00
jackqdyulei
471d71bae0
Add device name for connect string
...
When there are more than one connected device, show
a general summary.
Bug: 37365660
Test: RunSettingsRoboTests
Change-Id: I0eed734e82750969bef97a61dd59167e679c0203
2017-04-21 15:10:56 -07:00
TreeHugger Robot
4d33effa55
Merge "Revert "Listen to brigtness updates to update brightness summary.""
2017-04-21 22:07:14 +00:00
Suprabh Shukla
075a9f86c4
Merge "Renaming intent action manage unknown sources" into oc-dev am: d796fda4bf
...
am: 0bf520852d
2017-04-21 21:45:30 +00:00
jackqdyulei
f4c1cef322
Add TtsSpan for formatted time.
...
Talk back will read "Used for 3m" as "Used for 3 meters", but
it will read "Used for 3h 3m" correctly.
This cl add specific Ttsspan if the time only contains "minute"
Bug: 36379530
Test: Run SettingsRoboTests
Change-Id: I033575938cce24221980dddd9d66be4e18804541
2017-04-21 14:42:42 -07:00
Suprabh Shukla
0bf520852d
Merge "Renaming intent action manage unknown sources" into oc-dev
...
am: d796fda4bf
2017-04-21 21:32:02 +00:00
TreeHugger Robot
d796fda4bf
Merge "Renaming intent action manage unknown sources" into oc-dev
2017-04-21 21:22:10 +00:00
Suprabh Shukla
d9e317809f
Updating strings for Install unknown apps
...
Updating some strings for clarity based on ux review.
Test: Manual
Bug: 37362450
37362065
Change-Id: I26dd191d19ea8f3bd905c2e61ff77c4a2b796b3c
2017-04-21 14:20:56 -07:00
Suprabh Shukla
ed0ba74060
Renaming intent action manage unknown sources
...
Test: gts-tradefed run gts -m GtsExternalSourcesTestCases
Bug: 37515311
Change-Id: I3ad4ae24b67c6e8e68024bf5e8f73bc6563c443a
2017-04-21 14:20:55 -07:00
Fan Zhang
5f42717858
Merge "Remove icons for setting items in app & notification screen" into oc-dev am: 25b6ef1604
...
am: 63d9ad3dcc
2017-04-21 21:08:00 +00:00
Fan Zhang
52cf12dd00
Merge "Fix disable/force stop app button incorrect state." into oc-dev am: 6190c159e8
...
am: f1267ddbe1
2017-04-21 21:07:39 +00:00
Fan Zhang
63d9ad3dcc
Merge "Remove icons for setting items in app & notification screen" into oc-dev
...
am: 25b6ef1604
2017-04-21 21:03:40 +00:00
Fan Zhang
f1267ddbe1
Merge "Fix disable/force stop app button incorrect state." into oc-dev
...
am: 6190c159e8
2017-04-21 21:03:20 +00:00
TreeHugger Robot
25b6ef1604
Merge "Remove icons for setting items in app & notification screen" into oc-dev
2017-04-21 21:01:30 +00:00
TreeHugger Robot
6190c159e8
Merge "Fix disable/force stop app button incorrect state." into oc-dev
2017-04-21 21:00:33 +00:00
Marie Janssen
faa8c37da7
Bluetooth: Make pairing notification cancellable am: f8aaed9e1f
...
am: a4ad9d41f4
2017-04-21 20:37:52 +00:00
Marie Janssen
a4ad9d41f4
Bluetooth: Make pairing notification cancellable
...
am: f8aaed9e1f
2017-04-21 20:32:18 +00:00
jackqdyulei
da51747c46
Merge "Fix wrong voice call time in battery page" into oc-dev am: 057bd05420
...
am: 5e42c8e012
2017-04-21 20:29:17 +00:00
Marie Janssen
f8aaed9e1f
Bluetooth: Make pairing notification cancellable
...
Add actions to the pairing service notification so the user can dismiss
the pairing request if they want to.
Add some more information to logs when the user takes an action.
Reformat the file to match android style.
Test: pair from a remote device, dismiss using the new actions
Bug: 36036358
Change-Id: Ie110044bd4caf465f454452737000f01e7430925
(cherry picked from commit c79470d089
2017-04-21 20:19:20 +00:00
Matthew Fritze
4897eccd5d
Revert "Listen to brigtness updates to update brightness summary."
...
This reverts commit 83e2741bd7
2017-04-21 20:17:58 +00:00
jackqdyulei
5e42c8e012
Merge "Fix wrong voice call time in battery page" into oc-dev
...
am: 057bd05420
2017-04-21 20:17:47 +00:00
TreeHugger Robot
057bd05420
Merge "Fix wrong voice call time in battery page" into oc-dev
2017-04-21 20:04:08 +00:00
Daniel Sheng
4380a8fd7c
Merge "Added Trust Agent suggestion category from SUW"
2017-04-21 19:36:41 +00:00
Marie Janssen
87c6aa7cc8
Merge "Bluetooth: Make pairing notification cancellable" am: 6c142b35b4 am: 28bbd5bacb am: c7ad828691
...
am: f119ab31ad
2017-04-21 19:22:25 +00:00
Marie Janssen
f119ab31ad
Merge "Bluetooth: Make pairing notification cancellable" am: 6c142b35b4 am: 28bbd5bacb
...
am: c7ad828691
2017-04-21 18:54:11 +00:00
