Andrew Sapperstein
72c253f2b4
Merge "Null check intent before starting "learn more"." into nyc-dev am: 4e4e4ff19a am: 27af0ed9e2 am: 86a4c442c1
...
am: 78f98e3b17
2016-09-06 23:31:17 +00:00
Andrew Sapperstein
a26f0befd9
Null check intent before starting "learn more". am: e56d2be0b2 -s ours am: aa12cf603b am: 9177b11c8d
...
am: b2d898dcad
2016-09-06 23:31:16 +00:00
Maurice Lam
c74cefce54
[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE am: c94f2b93af am: d278da7952 am: 94a0fa5759 am: 746dff40ba -s ours am: 17ec053dd5 am: 27aabcd4df
...
am: 6a51dfdcf3
2016-09-06 23:28:49 +00:00
Andrew Sapperstein
78f98e3b17
Merge "Null check intent before starting "learn more"." into nyc-dev am: 4e4e4ff19a am: 27af0ed9e2
...
am: 86a4c442c1
2016-09-06 23:28:48 +00:00
Andrew Sapperstein
b2d898dcad
Null check intent before starting "learn more". am: e56d2be0b2 -s ours am: aa12cf603b
...
am: 9177b11c8d
2016-09-06 23:28:47 +00:00
Maurice Lam
79b1cf5efd
[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE am: c94f2b93af am: d278da7952 am: 94a0fa5759 am: 746dff40ba -s ours am: 17ec053dd5
...
am: c38b6a12cb
2016-09-06 23:27:05 +00:00
Andrew Sapperstein
4ff0fd3c5c
Merge "Null check intent before starting "learn more"." into nyc-dev am: 4e4e4ff19a
...
am: c16c5ded7b
2016-09-06 23:27:04 +00:00
Andrew Sapperstein
c09ea209da
Null check intent before starting "learn more". am: e56d2be0b2
...
am: 1d20e81742
2016-09-06 23:27:03 +00:00
Maurice Lam
6a51dfdcf3
[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE am: c94f2b93af am: d278da7952 am: 94a0fa5759 am: 746dff40ba -s ours am: 17ec053dd5
...
am: 27aabcd4df
2016-09-06 23:23:49 +00:00
Andrew Sapperstein
86a4c442c1
Merge "Null check intent before starting "learn more"." into nyc-dev am: 4e4e4ff19a
...
am: 27af0ed9e2
2016-09-06 23:23:48 +00:00
Andrew Sapperstein
9177b11c8d
Null check intent before starting "learn more". am: e56d2be0b2 -s ours
...
am: aa12cf603b
2016-09-06 23:23:47 +00:00
Maurice Lam
81ba97c7db
Remove help links when device is not provisioned. DO NOT MERGE am: d0a95da564
...
am: 595cae7039
2016-09-06 23:23:42 +00:00
Maurice Lam
27aabcd4df
[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE am: c94f2b93af am: d278da7952 am: 94a0fa5759 am: 746dff40ba -s ours
...
am: 17ec053dd5
2016-09-06 23:22:52 +00:00
Andrew Sapperstein
27af0ed9e2
Merge "Null check intent before starting "learn more"." into nyc-dev
...
am: 4e4e4ff19a
2016-09-06 23:22:50 +00:00
Maurice Lam
5cd7289ae8
Remove help links when device is not provisioned. DO NOT MERGE am: d0a95da564 -s ours am: 534fa13894 am: 9e081e0db8
...
am: 39390c9527
2016-09-06 23:21:45 +00:00
Maurice Lam
c38b6a12cb
[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE am: c94f2b93af am: d278da7952 am: 94a0fa5759 am: 746dff40ba -s ours
...
am: 17ec053dd5
2016-09-06 23:21:25 +00:00
Maurice Lam
17ec053dd5
[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE am: c94f2b93af am: d278da7952 am: 94a0fa5759
...
am: 746dff40ba
2016-09-06 23:18:46 +00:00
Maurice Lam
39390c9527
Remove help links when device is not provisioned. DO NOT MERGE am: d0a95da564 -s ours am: 534fa13894
...
am: 9e081e0db8
2016-09-06 23:18:46 +00:00
Andrew Sapperstein
aa12cf603b
Null check intent before starting "learn more".
...
am: e56d2be0b2
2016-09-06 23:18:45 +00:00
Maurice Lam
9e081e0db8
Remove help links when device is not provisioned. DO NOT MERGE am: d0a95da564 -s ours
...
am: 534fa13894
2016-09-06 23:16:47 +00:00
Maurice Lam
746dff40ba
[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE am: c94f2b93af am: d278da7952
...
am: 94a0fa5759
2016-09-06 23:14:25 +00:00
Maurice Lam
534fa13894
Remove help links when device is not provisioned. DO NOT MERGE
...
am: d0a95da564
2016-09-06 23:14:15 +00:00
Andrew Sapperstein
c16c5ded7b
Merge "Null check intent before starting "learn more"." into nyc-dev
...
am: 4e4e4ff19a
2016-09-06 23:13:26 +00:00
Andrew Sapperstein
1d20e81742
Null check intent before starting "learn more".
...
am: e56d2be0b2
2016-09-06 23:13:26 +00:00
Maurice Lam
595cae7039
Remove help links when device is not provisioned. DO NOT MERGE
...
am: d0a95da564
2016-09-06 23:12:02 +00:00
Maurice Lam
94a0fa5759
[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE am: c94f2b93af
...
am: d278da7952
2016-09-06 23:11:17 +00:00
Maurice Lam
d278da7952
[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE
...
am: c94f2b93af
2016-09-06 23:08:45 +00:00
TreeHugger Robot
4e4e4ff19a
Merge "Null check intent before starting "learn more"." into nyc-dev
2016-09-06 23:07:27 +00:00
TreeHugger Robot
1355d03287
Merge "[Settings App] Get ringtone titles from Ringtone"
2016-09-06 00:27:39 +00:00
Robin Lee
83e5babed1
Merge "Cut work sound prefs when personal ones are gone"
2016-09-05 09:58:17 +00:00
TreeHugger Robot
482458d46a
Merge "Replaced deprecated calls to INetworkPolicyManager."
2016-09-03 05:47:45 +00:00
Felipe Leme
a1132e9f21
Replaced deprecated calls to INetworkPolicyListener.
...
Test: manual
BUG: 28791717
Change-Id: I23e08dc472d7d3d37f09e2811bb450e907b7bb1f
2016-09-02 17:52:19 -07:00
Maurice Lam
c94f2b93af
[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE
...
Remove the learn more link during setup wizard, because HelpUtils is
returning null for the intent while the device is not provisioned.
Bug: 31246856
Change-Id: I4cf5c282f170188aef98a02d3b96af5e63ea7f39
2016-09-02 16:53:52 -07:00
Felipe Leme
ce015fce0a
Replaced deprecated calls to INetworkPolicyManager.
...
BUG: 28791717
Test: manual
Change-Id: I3df5214ead3b94f3ffa58e3ffad197a4ec09bef0
2016-09-02 16:28:07 -07:00
Lei Yu
393e6532a9
Merge "Add the interface to check the status of location setting."
2016-09-02 20:13:16 +00:00
Sooraj Sasindran
c6a4b7282c
Merge "Provide calling package name in cell info APIs"
2016-09-02 18:56:41 +00:00
Robin Lee
e51fc163c2
Cut work sound prefs when personal ones are gone
...
For example when:
- voice calls aren't supported, we hide phone ringtone.
- audio is single stream, we hide everything.
Bug: 30658854
Change-Id: I8b2ad2fa08b35fa93f10447ef718a767fa389417
2016-09-02 17:28:00 +01:00
Robin Lee
bed8559a20
Enable the switch in TrustedCredentialsSettings
...
And match the behaviour of the dialog button that does the same thing,
so it only asks for confirmation when something is being irrevocably
deleted.
The dialog button should not be removed as it's used by system services
that deeplink to a specific cert to give the option of reviewing,
removing, or trusting it.
Bug: 31159682
Change-Id: I4fb3f38f8ab0e80e5c2dca0fc3d6d3bd4db26bb6
2016-09-02 11:03:32 +01:00
TreeHugger Robot
cd3ba14277
Merge "Update Bluetooth toggle UI to UX spec - settings"
2016-09-02 03:37:14 +00:00
Maurice Lam
d0a95da564
Remove help links when device is not provisioned. DO NOT MERGE
...
Bug: 31246856
Change-Id: Id638de8ab1c6b815d62916a584892be84cabe1ae
2016-09-01 17:12:20 -07:00
Svet Ganov
0cf1298a44
Update Bluetooth toggle UI to UX spec - settings
...
Change-Id: I171d3e55e8a480d304e4dc4e0debbd2f3ab27651
2016-09-01 16:47:09 -07:00
Andrew Sapperstein
e56d2be0b2
Null check intent before starting "learn more".
...
It is possible in certain build configurations to have an invalid
link. Instead of crashing, swallow the error and write to logs.
BUG: 28381984
Fixes: 31246856
Change-Id: I19f20b96afb42758187707f1b86a5817e8d737a8
(cherry picked from commit 6561d4870f
2016-09-01 21:57:59 +00:00
Bill Yi
1b1ca53a9e
Merge "Import translations. DO NOT MERGE"
2016-09-01 18:10:26 +00:00
Rubin Xu
d7d94666a3
Merge "Prompt to turn on/unlock profile before showing account sync settings" into nyc-mr1-dev am: 95089be460 am: e0cb0dc2c8
...
am: 523c491662
2016-09-01 10:55:19 +00:00
Rubin Xu
0a0d381566
Prompt to turn on/unlock profile before showing account sync settings am: 3231afe95b am: e1237c8096
...
am: cc2861ab56
2016-09-01 10:55:18 +00:00
Rubin Xu
523c491662
Merge "Prompt to turn on/unlock profile before showing account sync settings" into nyc-mr1-dev am: 95089be460
...
am: e0cb0dc2c8
2016-09-01 10:52:31 +00:00
Rubin Xu
cc2861ab56
Prompt to turn on/unlock profile before showing account sync settings am: 3231afe95b
...
am: e1237c8096
2016-09-01 10:52:30 +00:00
Rubin Xu
e0cb0dc2c8
Merge "Prompt to turn on/unlock profile before showing account sync settings" into nyc-mr1-dev
...
am: 95089be460
2016-09-01 10:48:47 +00:00
Rubin Xu
e1237c8096
Prompt to turn on/unlock profile before showing account sync settings
...
am: 3231afe95b
2016-09-01 10:48:46 +00:00
Rubin Xu
95089be460
Merge "Prompt to turn on/unlock profile before showing account sync settings" into nyc-mr1-dev
2016-09-01 10:41:29 +00:00
