Maurice Lam
81ba97c7db
Remove help links when device is not provisioned. DO NOT MERGE am: d0a95da564
...
am: 595cae7039
Change-Id: I4a32c4c628ce980562c115c075d05aff9b7d6769
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
Change-Id: I11ea83d07eebfb55b8f1fbd0f431120c791314b1
2016-09-06 23:22:52 +00:00
Andrew Sapperstein
27af0ed9e2
Merge "Null check intent before starting "learn more"." into nyc-dev
...
am: 4e4e4ff19a
Change-Id: Ia2a0fec158a49c723cc3923baafa024aa3570c0b
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
Change-Id: I5bf874a16c7939cdde5ab76728c19e199f9e8d3c
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
Change-Id: I82cf5a36581abe7c9e14400822c20a38ba4ed03c
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
-s ours
Change-Id: I304081ab8e9ddaeb48af51cc07c4d3e131e7b13b
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
Change-Id: I84fb88a14e3c15e00a0caade542a2c0ea4902777
2016-09-06 23:18:46 +00:00
Andrew Sapperstein
aa12cf603b
Null check intent before starting "learn more".
...
am: e56d2be0b2
-s ours
Change-Id: Ia53a28a35679db7d25c15c9cc9b862da7065f68a
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
Change-Id: I6c98994b9b7629f38e7f718a8e559456ea97443c
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
Change-Id: I76460eee64ad7bc84d67379dc4f952deb2232130
2016-09-06 23:14:25 +00:00
Maurice Lam
534fa13894
Remove help links when device is not provisioned. DO NOT MERGE
...
am: d0a95da564
-s ours
Change-Id: Ib1a0d40efcd380ea6dc3a959770a3ce1b4e6114f
2016-09-06 23:14:15 +00:00
Andrew Sapperstein
c16c5ded7b
Merge "Null check intent before starting "learn more"." into nyc-dev
...
am: 4e4e4ff19a
Change-Id: I4d25b74d3cb8781b5f80f714d749dd59f3ec0c83
2016-09-06 23:13:26 +00:00
Andrew Sapperstein
1d20e81742
Null check intent before starting "learn more".
...
am: e56d2be0b2
Change-Id: I93aa097da0b6404dfbe279ee7d678e1f83a9ec93
2016-09-06 23:13:26 +00:00
Maurice Lam
595cae7039
Remove help links when device is not provisioned. DO NOT MERGE
...
am: d0a95da564
Change-Id: Ie8658b5ceb4546013f893f33301834db4a773f10
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
Change-Id: I771b15c4c94314f7fb3f1d3d3734b0c97a35f782
2016-09-06 23:11:17 +00:00
Maurice Lam
d278da7952
[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE
...
am: c94f2b93af
Change-Id: Ib66b9b9d6b97fe1299a24b0c92991b4bd6a46656
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
Change-Id: I2501eca9be59fb354b825bef0d34cb79b81fdecf
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
Change-Id: I7b594a3064991241626249301fff35370887ee25
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
Change-Id: Ia51c7aa3ef09f2f0780766c2b9fa515da4c8d4d9
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
Change-Id: I6b1937ebeabd7f90b1571e655b654375e4ae4137
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
Change-Id: I9455961b5743f4042f3984d4b868194baeca60b3
2016-09-01 10:48:47 +00:00
Rubin Xu
e1237c8096
Prompt to turn on/unlock profile before showing account sync settings
...
am: 3231afe95b
Change-Id: I4385b5c3d478028a5eabecfe23b073633e27e287
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
Bill Yi
5ac56ab846
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 6030f64a58
-s ours am: 3e3da9b35b
-s ours
...
am: 911f7fa407
-s ours
Change-Id: I7c32203c1794f75d7fb00b6624fa566d300ce063
2016-09-01 07:18:57 +00:00
Bill Yi
ad268327cc
Import translations. DO NOT MERGE am: 3afce04bf8
-s ours am: 9538f83c79
-s ours
...
am: edf0e5cce2
-s ours
Change-Id: Idecfef1d5108a3aee7fc173b47b32a756d990389
2016-09-01 07:18:56 +00:00
Bill Yi
911f7fa407
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 6030f64a58
-s ours
...
am: 3e3da9b35b
-s ours
Change-Id: I858a80ddd045dffa41782832a3032120e716b169
2016-09-01 06:53:30 +00:00
Bill Yi
edf0e5cce2
Import translations. DO NOT MERGE am: 3afce04bf8
-s ours
...
am: 9538f83c79
-s ours
Change-Id: Ief9b13d93e420fd6e39b714b3ce42badc0e4a856
2016-09-01 06:53:29 +00:00
Bill Yi
3e3da9b35b
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
...
am: 6030f64a58
-s ours
Change-Id: Ib9c3da80b8e9ed49d7d765299a0ff53d345f0cc9
2016-09-01 06:45:28 +00:00
Bill Yi
9538f83c79
Import translations. DO NOT MERGE
...
am: 3afce04bf8
-s ours
Change-Id: Ieacfa08b8f57ca01709324331f52b74c3cb80dfc
2016-09-01 06:45:27 +00:00
TreeHugger Robot
6030f64a58
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-09-01 06:36:19 +00:00
Bill Yi
3afce04bf8
Import translations. DO NOT MERGE
...
Change-Id: I97dae1e7f6b416d7a676e9c2c76942f6ada9582a
Auto-generated-cl: translation import
2016-08-31 21:56:25 -07:00
Bill Yi
a3d205dddd
Import translations. DO NOT MERGE
...
Change-Id: I9a5e888a9efdaa910ff1c1f076f5fffabd7d190c
Auto-generated-cl: translation import
2016-08-31 21:51:14 -07:00
Doris Ling
bf4c2a2c89
Fix NullPointerException when refreshing wifi preferences. am: b8011dbb93
am: 5ec9ffe86a
...
am: a9ac2eea46
Change-Id: I760ab02522c85da10c63a7922b46e93657d174d9
2016-09-01 00:56:51 +00:00
Doris Ling
e9d7698b93
Fix NullPointerException when refreshing wifi preferences. am: b8011dbb93
am: 7a15f88912
am: e972a23faf
am: e3f9654ebc
...
am: 7d16fb0baf
Change-Id: Iaf0fb7bbac3fd1810902150490b59e7baa6d19b7
2016-09-01 00:56:50 +00:00