Commit Graph

14339 Commits

Author SHA1 Message Date
Todd Kennedy
2ef1aa5894 Direct launch to web action
We want to be able to direct launch into the web action settings
Fixes: 31338071

Change-Id: I295729b8c9e0d3c1196ed820a9e9f6163bf611b4
2016-09-08 13:51:12 -07:00
Salvador Martinez
55e738aa03 Merge "resolve merge conflicts of 8ec7028 to master" 2016-09-07 18:02:12 +00:00
TreeHugger Robot
c2d59c0666 Merge "Replaced deprecated calls to INetworkPolicyListener." 2016-09-07 17:42:24 +00:00
Salvador Martinez
923534f641 resolve merge conflicts of 8ec7028 to master
Change-Id: I02767dea7e2fd8e6dfdfe495af1c28587b080630
2016-09-07 10:24:03 -07:00
Salvador Martinez
8ec70281ee Fixed Sound Settings summary text am: b706d4e956
am: d39c1fa395

Change-Id: I73fa598eb0067b5c1497e7bac803b9d349eaf86c
2016-09-07 16:17:14 +00:00
Salvador Martinez
d39c1fa395 Fixed Sound Settings summary text
am: b706d4e956

Change-Id: I6161e1ffbec8e17591240a0a16801afdae113fbb
2016-09-07 16:14:44 +00:00
Salvador Martinez
20d19a89da Merge "Fixed Sound Settings summary text" into nyc-mr1-dev 2016-09-07 16:06:41 +00:00
Tomohiro Takeda
6cd4db0576 Fix ApplicationsState.Session memory leak in settings app
Removes the creation of an unused session and some other redundant code
left behind when c5291b87 was applied.

Change-Id: Ie5ec0f00b3240df9cf2c4fa3bd05b49ba45f4547
2016-09-07 14:22:11 +02:00
Salvador Martinez
b706d4e956 Fixed Sound Settings summary text
The summary for Sound settings was not
descriptive enough when the volume was set
to 0% so additional strings were added. Now
it will change let you know the status
of the ringer and vibration settings when
at 0% volume. Espresso tests added to test
that text is properly updated in each of
these states.

Test: make SettingsTests
Bug: 31099179
Change-Id: Id49e2d0c4b7ac0f17efcdaf31de48d5eb678ca46
2016-09-06 17:23:50 -07: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
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
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
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
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
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
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
Doris Ling
7d16fb0baf Fix NullPointerException when refreshing wifi preferences. am: b8011dbb93 am: 7a15f88912 am: e972a23faf
am: e3f9654ebc

Change-Id: I48da5c628897cb92f47525772fbfa2ee78929f61
2016-09-01 00:08:17 +00:00
Doris Ling
5ec9ffe86a Fix NullPointerException when refreshing wifi preferences.
am: b8011dbb93

Change-Id: I026cfeb1948394f31e3e39a344ee48dd6bca50b8
2016-09-01 00:07:21 +00:00
Doris Ling
e3f9654ebc Fix NullPointerException when refreshing wifi preferences. am: b8011dbb93 am: 7a15f88912
am: e972a23faf

Change-Id: I60efde4b22dad901c491dc4ce7585c698047420b
2016-09-01 00:05:04 +00:00
Doris Ling
e972a23faf Fix NullPointerException when refreshing wifi preferences. am: b8011dbb93
am: 7a15f88912

Change-Id: I3b04d4d87063f928fa76b4843ca0692c8d0311cb
2016-09-01 00:02:02 +00:00
Doris Ling
7a15f88912 Fix NullPointerException when refreshing wifi preferences.
am: b8011dbb93

Change-Id: Ib77f937b79813351594037eaa424fac33995f336
2016-08-31 23:59:08 +00:00
Sooraj Sasindran
5cce06b2e8 Provide calling package name in cell info APIs
Provide calling package name in cell info APIs

BUG=31041780
Change-Id: Iad6e5c67ead2bf50d83d1ccad48c3f0341f53712
2016-08-31 23:34:11 +00:00
Doris Ling
b8011dbb93 Fix NullPointerException when refreshing wifi preferences.
AccessPointPreference.refresh() is being called in different threads.
The refresh of the preference should only be updated in the main thread.
When access point updates is received not in the main thread, will post
the refreshing of the preference to the message queue to make the update
on the UI thread.

Test: auto - run monkey to verify there is no ANR or crash
      manual - go to Settings->Wifi, toggle on/off many times and verify
      there is no crash.

Change-Id: I656a70ecf2e7b9446c7b95b6b42ab19a5cc2e51c
Fixes: 30902893
2016-08-31 22:19:19 +00:00
Phil Weaver
02e894c52a Make sure setting switch bar state is announced. am: 664f6dacca am: d8c8c632d4
am: 06c04d91c7

Change-Id: I623bd0cf15f7a1ef73393e63fd739749834910c5
2016-08-31 22:07:24 +00:00
Phil Weaver
06c04d91c7 Make sure setting switch bar state is announced. am: 664f6dacca
am: d8c8c632d4

Change-Id: I8eceb0ed685ec5101132027f547c0b577c8c459c
2016-08-31 21:38:26 +00:00
Phil Weaver
d8c8c632d4 Make sure setting switch bar state is announced.
am: 664f6dacca

Change-Id: I8ecc83b5affa7af17071971abee57320d1fe2333
2016-08-31 21:34:53 +00:00
Phil Weaver
e954b992d8 Merge "Make sure setting switch bar state is announced." into nyc-mr1-dev 2016-08-31 21:32:08 +00:00
Rebecca Silberstein
c2f6141093 TetherSettings: check provisionApp array length am: 39f0e41ec7 am: 02602b9b2c
am: 2534a478a6

Change-Id: Ibdd4041fb89cace2e3e9734a243ce4d85a922188
2016-08-31 21:22:21 +00:00
Rebecca Silberstein
2534a478a6 TetherSettings: check provisionApp array length am: 39f0e41ec7
am: 02602b9b2c

Change-Id: I51d5a3094a575254489d734c823e10608ddb369b
2016-08-31 20:51:31 +00:00
Rebecca Silberstein
02602b9b2c TetherSettings: check provisionApp array length
am: 39f0e41ec7

Change-Id: I25e14b85e810e9423e8c89d8449e2826acb77e74
2016-08-31 20:45:21 +00:00
Rebecca Silberstein
3756593811 Merge "TetherSettings: check provisionApp array length" into nyc-mr1-dev 2016-08-31 20:28:56 +00:00
jackqdyulei
348bcc1e81 Add the interface to check the status of location setting.
Bug: 30790766
Test: ag/1346969

Change-Id: Id6de284ba90f75015372dbe28805bdc0d94a0723
2016-08-31 12:54:17 -07:00
Andreas Gampe
ada98fb5b3 resolve merge conflicts of d30af7c to master
Change-Id: I3484e0e6c2a092f05539af569a9d9131f006ecf1
2016-08-30 20:36:50 -07:00
Todd Kennedy
d30af7c247 Implement Web Action settings am: d5824967ee
am: 1fc2e5dcb7

Change-Id: I4e4976e848af3e8d12b65730147be1257fed382c
2016-08-31 02:28:38 +00:00
Todd Kennedy
1fc2e5dcb7 Implement Web Action settings
am: d5824967ee

Change-Id: Ibd54894d1c71d835931e0b0296add2b1a010cde5
2016-08-31 02:25:37 +00:00
TreeHugger Robot
1721e4510f Merge "Implement Web Action settings" into nyc-mr1-dev 2016-08-31 02:20:47 +00:00
Salvador Martinez
0308649104 Can restore state on rotate personal dict screen am: 8f4eb4d74b am: 45cdbd2669
am: 6b41874231

Change-Id: I426e4bfea077b3494a8a5a8e3eea0659186b60f8
2016-08-31 01:19:32 +00:00