Commit Graph

24660 Commits

Author SHA1 Message Date
Tony Mantler
bd99c43887 Merge "Move a bunch of app restrictions logic to SettingsLib" 2016-01-12 17:17:04 +00:00
Noah Wang
73b1f13756 Merge "Adding settings screen for font size. Also factored out common components from screen magnification settings screen." 2016-01-12 17:04:04 +00:00
Makoto Onuki
32ed1f997c Merge "Remove fixed TODO (Settings)" 2016-01-12 00:39:18 +00:00
Makoto Onuki
d669fee6fb Remove fixed TODO (Settings)
Change-Id: Ia4477acffb6209e5d3103367e69dbc789399cd9e
2016-01-11 15:36:52 -08:00
Sudheer Shanka
38268b37d0 Merge "Add padlock to items in overflow menus and dropdown dialogs." 2016-01-11 22:15:15 +00:00
Tony Mantler
06add5c5c3 Move a bunch of app restrictions logic to SettingsLib
Change-Id: I54106d1175ba8bff8586c8c4dcef87e51fd1483b
2016-01-11 13:39:36 -08:00
Noah Wang
e64cc267e7 Adding settings screen for font size. Also factored out common
components from screen magnification settings screen.

Change-Id: I1828c7c0246f14493903172f2da7419fdc8e5f09
2016-01-11 12:57:00 -08:00
Sudheer Shanka
1b31df3221 am 3ad534aa: am bc956309: Update warning dialog on work profile deletion. am: f1fa3c7a3d
am: a390270880

* commit 'a3902708801d56a16b4d6aedd130893e9da6ff62':
2016-01-11 20:40:44 +00:00
Geoff Mendal
c73deb001e am 0baeee0c: (-s ours) am 79670bbe: (-s ours) Import translations. DO NOT MERGE am: 392858626b -s ours
am: b2bf537030  -s ours

* commit 'b2bf53703095b2fd5eadfcd677b3dbb51a75cb17':
2016-01-11 20:40:33 +00:00
Alan Viverette
b88ef038e0 am fb7827f3: am d4988442: Point to Material.Settings themes am: d508cd9b6f
am: 923938b6c9

* commit '923938b6c9d303ae837fefc9e2101f9a221ba4a0':
2016-01-11 20:39:12 +00:00
Yorke Lee
6c9ea7227e am 80848e20: am 169f824b: Merge "Rename setDefaultDialerApplication for consistency" into mnc-dev am: beed867ada
am: 1d942caaf9

* commit '1d942caaf9a6f52ce2a688c25edf7541a1314521':
2016-01-11 20:39:02 +00:00
Jorim Jaggi
6c4dc42b12 am 80134266: am 4a2423ba: Move fingerprint enroll logic into sidecar fragment am: 0f6400fac5
am: 3e7e01a23e

* commit '3e7e01a23e9a17acec416b4127834a0a8915c273':
2016-01-11 20:38:52 +00:00
Jorim Jaggi
9d63b8fab3 am 6ecd1005: am 11eae045: Allow incremental builds for settings. am: a1bc287cc3
am: 340b8dcb7b

* commit '340b8dcb7b75ea0ced922648e37c551016dce44e':
2016-01-11 20:38:42 +00:00
Maurice Lam
788ceec867 am ab82d2fd: am 9fab5c1d: Merge "[LockSetup] Hide back button in notification interstitial" into mnc-dev am: 3cd6eabcb8
am: 7c63d887e0

* commit '7c63d887e05ed7f9cc6096827e0c4045b819f474':
2016-01-11 20:38:32 +00:00
Maurice Lam
ad70eeea32 am 824b09cb: am 80ca2687: Merge "[WifiSetup] Show progress bar when scanning" into mnc-dev am: bb61d7bc66
am: e28f490134

* commit 'e28f490134b132aca7e80323bbcd8d41eac0954e':
2016-01-11 20:38:22 +00:00
Jason Monk
9231d87dbe am e5f7ba7f: am 70c5472f: Merge "Move process stats screen into memory screen." into mnc-dev am: 5e1e20237d
am: c87c93659d

* commit 'c87c93659d517d49363dc598094d3319ff9ee409':
2016-01-11 20:38:12 +00:00
Geoff Mendal
b85fda6fa7 am 6d53b908: (-s ours) am d1b9edab: (-s ours) Import translations. DO NOT MERGE am: e2b5070c10 -s ours
am: 87a98ceb75  -s ours

* commit '87a98ceb75a753796f34854bab3a0b497371f3e3':
2016-01-11 20:38:02 +00:00
Geoff Mendal
d17aced04e am 3eb3af9d: (-s ours) am c5184ff1: (-s ours) Import translations. DO NOT MERGE am: 5312261de7 -s ours
am: 34ed83bd9d  -s ours

* commit '34ed83bd9d5649f2781eff6fa759f4fa66f0a789':
2016-01-11 20:37:51 +00:00
Sudheer Shanka
a390270880 am 3ad534aa: am bc956309: Update warning dialog on work profile deletion.
am: f1fa3c7a3d

* commit 'f1fa3c7a3daa6642b20d1afda9ce30f996ae8866':
2016-01-11 20:37:49 +00:00
Geoff Mendal
b2bf537030 am 0baeee0c: (-s ours) am 79670bbe: (-s ours) Import translations. DO NOT MERGE
am: 392858626b  -s ours

* commit '392858626b0b4583a71372a9b05be94927958d2f':
2016-01-11 20:37:37 +00:00
Alan Viverette
923938b6c9 am fb7827f3: am d4988442: Point to Material.Settings themes
am: d508cd9b6f

* commit 'd508cd9b6f7d7e567d1989be4b365bfee0112704':
2016-01-11 20:37:26 +00:00
Yorke Lee
1d942caaf9 am 80848e20: am 169f824b: Merge "Rename setDefaultDialerApplication for consistency" into mnc-dev
am: beed867ada

* commit 'beed867ada66f98c1867dbf4bdbb13d1bb0c1a81':
2016-01-11 20:37:15 +00:00
Jorim Jaggi
3e7e01a23e am 80134266: am 4a2423ba: Move fingerprint enroll logic into sidecar fragment
am: 0f6400fac5

* commit '0f6400fac5ba7d9956505f7035545fe082a33f26':
2016-01-11 20:37:04 +00:00
Jorim Jaggi
340b8dcb7b am 6ecd1005: am 11eae045: Allow incremental builds for settings.
am: a1bc287cc3

* commit 'a1bc287cc34a5d62c47f3c9768ab3d080234de7b':
2016-01-11 20:36:53 +00:00
Maurice Lam
7c63d887e0 am ab82d2fd: am 9fab5c1d: Merge "[LockSetup] Hide back button in notification interstitial" into mnc-dev
am: 3cd6eabcb8

* commit '3cd6eabcb8cd0f36c861891c7c8d5bfdea6144e2':
2016-01-11 20:36:42 +00:00
Maurice Lam
e28f490134 am 824b09cb: am 80ca2687: Merge "[WifiSetup] Show progress bar when scanning" into mnc-dev
am: bb61d7bc66

* commit 'bb61d7bc6623fe9373deb75eca180399800ad4b7':
2016-01-11 20:36:30 +00:00
Jason Monk
c87c93659d am e5f7ba7f: am 70c5472f: Merge "Move process stats screen into memory screen." into mnc-dev
am: 5e1e20237d

* commit '5e1e20237d3fbc0c1201e27bbd9fa7e21be0c430':
2016-01-11 20:36:19 +00:00
Geoff Mendal
87a98ceb75 am 6d53b908: (-s ours) am d1b9edab: (-s ours) Import translations. DO NOT MERGE
am: e2b5070c10  -s ours

* commit 'e2b5070c1096e546ff1e1429732b25c1af7d16f5':
2016-01-11 20:36:07 +00:00
Geoff Mendal
34ed83bd9d am 3eb3af9d: (-s ours) am c5184ff1: (-s ours) Import translations. DO NOT MERGE
am: 5312261de7  -s ours

* commit '5312261de76661827eae1915bcf4d42fa36309b0':
2016-01-11 20:35:53 +00:00
Sudheer Shanka
4bb4886fce Add padlock to items in overflow menus and dropdown dialogs.
Bug: 26378442
Change-Id: I7b21ff8e0b95f6cda9f720f979f7c475244b340d
2016-01-11 20:19:45 +00:00
Jason Monk
f0df7bcdbe Merge "Move some battery stuff to SettingsLib" 2016-01-11 19:30:24 +00:00
Jeremy Klein
d4ae7647bf Merge "Use the new TETHER_PRIVILEGED permission." 2016-01-11 19:10:26 +00:00
Clara Bayarri
13c52fa850 Merge "Work Profile Passphrase Setting" 2016-01-11 17:30:26 +00:00
Geoff Mendal
74a350aced Import translations. DO NOT MERGE
Change-Id: I8455592da52dae13925c1f3e91429d8f8bf622a0
Auto-generated-cl: translation import
2016-01-11 06:29:22 -08:00
Clara Bayarri
6934a044b8 Work Profile Passphrase Setting
Create a new section in Security Settings which includes all
settings for the Work Challenge.
Only some settings apply to the Work Challenge, so we reuse
the security settings layouts for items and compare them against
a whitelist to remove unwanted items.

Additionally, remove all usages of ChooseLockGeneric.KEY_USER_ID
in favor of Intent.EXTRA_USER_ID.

Change-Id: I3d1ba953a2056f7c61a7b3feeb8b49f1a352dff6
2016-01-11 10:30:18 +00:00
Andy Hung
00683f9d62 Merge "Add mono audio to SoundSettings" 2016-01-08 23:17:55 +00:00
Philip P. Moltmann
a164305d4d Merge "Fix string description for print framework summary" 2016-01-08 23:04:24 +00:00
Philip P. Moltmann
268f75e2f5 Fix string description for print framework summary
Bug: 26457511, 26461716
Change-Id: I3273bcb590b46438f46ac11fa125497c3f9d2e36
2016-01-08 15:03:01 -08:00
Mark Salyzyn
d23e45bfb5 Merge "whitelist "snet_event_log" when turning logs off" am: 574814a4c2
am: 836be3ff89

* commit '836be3ff89124e7ac8cf221f56de1c45b7a8c092':
  whitelist "snet_event_log" when turning logs off
2016-01-08 22:46:02 +00:00
Mark Salyzyn
836be3ff89 Merge "whitelist "snet_event_log" when turning logs off"
am: 574814a4c2

* commit '574814a4c2ac0e66cd14eb6370dba426bb6d5882':
  whitelist "snet_event_log" when turning logs off
2016-01-08 22:44:12 +00:00
Mark Salyzyn
574814a4c2 Merge "whitelist "snet_event_log" when turning logs off" 2016-01-08 22:41:10 +00:00
Mark Salyzyn
8fc90b4fe0 whitelist "snet_event_log" when turning logs off
- Before silencing the logs, ensure security logs are whitelisted
- Only touch persist.log.tag properties if they need to be, add
  stacking to the property.
- Clear persist.logd.size property when at default setting

Bug: 26178938
Change-Id: I8fdb040062dc9cbb23d7bc3c117d96ff8550c132
2016-01-08 13:48:24 -08:00
Michael Wright
ed46e1a5fa Merge "Directly show the layout selection screen." 2016-01-08 20:55:01 +00:00
Jason Monk
27985e1f92 Move some battery stuff to SettingsLib
So that it can be used in the battery detail panel

Change-Id: I31eac974d29838726450940109b52d458f29c192
2016-01-08 14:13:05 -05:00
Michal Karpinski
fbbb7f48e8 Merge "Adjusting call to AMN#requestBugReport()" 2016-01-08 18:00:55 +00:00
Michal Karpinski
c78b926621 Adjusting call to AMN#requestBugReport()
Bug: 26152603
Change-Id: I5cf66889732aaca2479f09ebacb7beb36f84ea58
2016-01-08 17:46:26 +00:00
Anna Galusza
ffce406d6d Merge "Add A11y SUW hub page after verifying build fix." 2016-01-08 17:30:00 +00:00
Jason Monk
480c5ac083 Merge "Add suggestions to settings" 2016-01-08 14:50:17 +00:00
Andrei Stingaceanu
36504833e0 Merge "'Lock Screen Message' option is in enable state for 'None'." 2016-01-08 10:25:52 +00:00
Philip P. Moltmann
ef7c7fe196 Merge "Small corrections to the code that generates the print summary in the settings." 2016-01-08 00:34:58 +00:00