Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
238,113 Commits 3 Branches 0 Tags
6e068483f22e93da06894de3d79bd5033d4e4d79
Commit Graph

414 Commits

Author SHA1 Message Date
Jason Monk
7bd0882a7a Merge "Fix Settings home lifecycle" into nyc-dev 
am: a2e759d

* commit 'a2e759d963e2b75775bb3708039f687d57920998':
  Fix Settings home lifecycle
 2016-03-17 18:01:54 +00:00
Gustav Sennton
6afd0e566d Merge "Change wording of WebView Implementation invalid-choice Toast." into nyc-dev 
am: 4b187ac

* commit '4b187acf9c8affaa62d34e59059238bf3931ddcd':
  Change wording of WebView Implementation invalid-choice Toast.
 2016-03-17 18:01:42 +00:00
Svet Ganov
c498f171be Merge "Disallow disabling of the package installer" into nyc-dev 
am: 3084bb8

* commit '3084bb87190afe17587d0d01cec2cfa9b897be9d':
  Disallow disabling of the package installer
 2016-03-17 17:35:21 +00:00
Jason Monk
a2e759d963 Merge "Fix Settings home lifecycle" into nyc-dev 2016-03-17 13:32:20 +00:00
Gustav Sennton
4b187acf9c Merge "Change wording of WebView Implementation invalid-choice Toast." into nyc-dev 2016-03-17 10:53:24 +00:00
Svetoslav Ganov
3084bb8719 Merge "Disallow disabling of the package installer" into nyc-dev 2016-03-16 23:32:26 +00:00
Jason Monk
14ee8d7e17 Fix Settings home lifecycle 
Bug: 26268813
Bug: 27330440
Change-Id: I6f5ab4a412b129728db3e8dff134c04272909997
 2016-03-16 14:26:24 -04:00
Geoff Mendal
ed893367b9 Import translations. DO NOT MERGE 
Change-Id: Iefbda82e967a365520cdf26df0728b8eb425c6a7
Auto-generated-cl: translation import
 2016-03-16 07:27:26 -07:00
Sudheer Shanka
a58b0bb9d5 Merge "Call preference.setEnabled only after updating disabledByAdmin state." into nyc-dev 
am: 13e22319e4

* commit '13e22319e4d0bf24c3fd08649e180be648f28ad5':
  Call preference.setEnabled only after updating disabledByAdmin state.
 2016-03-14 23:56:39 +00:00
Sudheer Shanka
2893302afc Call preference.setEnabled only after updating disabledByAdmin state. 
We check the value of disabledByAdmin state in setEnabled, so update it
first before calling setEnabled.

Bug: 27642236
Change-Id: Ie6c805b85a3afb87ffdaad0b80dbadc172b62d49
 2016-03-14 14:59:52 -07:00
Nick Kralevich
bfb2ac75fb fix spelling 
am: 3972507684

* commit '39725076847c64ca957db65b9319af5c13040ffd':
  fix spelling
 2016-03-12 23:06:56 +00:00
Nick Kralevich
3972507684 fix spelling 
Change-Id: I82e64fa8a64be0fbfda748e6b57b5d339fd6f903
 2016-03-12 15:00:50 -08:00
Gustav Sennton
ae71ddd154 Change wording of WebView Implementation invalid-choice Toast. 
Add more intuitive and compact text for explaining that the chosen
WebView implementation is no longer invalid.

Bug: 27368515, 27424132
Change-Id: Ia0302964ebeecbd8f69eab436a58c8526359ec16
 2016-03-10 18:15:23 +00:00
Tony Mantler
d829f9ed79 Merge "Remove redundant twiddling of Settings.Secure.ACCESSIBILITY_ENABLED" into nyc-dev 
am: 79d7e54f70

* commit '79d7e54f70749b974157b9b6273f455085e0ee24':
  Remove redundant twiddling of Settings.Secure.ACCESSIBILITY_ENABLED
 2016-03-10 16:57:35 +00:00
Tony Mantler
79d7e54f70 Merge "Remove redundant twiddling of Settings.Secure.ACCESSIBILITY_ENABLED" into nyc-dev 2016-03-10 16:54:10 +00:00
Sudheer Shanka
1aabb442ad Merge "Use compound drawable instead of image span." into nyc-dev 
am: 91f80006e5

* commit '91f80006e536c0b925d20dbdcd10cec46cfee36a':
  Use compound drawable instead of image span.
 2016-03-10 16:03:26 +00:00
Sudheer Shanka
91f80006e5 Merge "Use compound drawable instead of image span." into nyc-dev 2016-03-10 15:58:25 +00:00
Sudheer Shanka
05be04ed88 Merge "Fix description for the string disabled_by_admin." into nyc-dev 
am: 0dd17c8406

* commit '0dd17c840645e6d1fd67276b45420ca742df6110':
  Fix description for the string disabled_by_admin.
 2016-03-10 01:13:37 +00:00
Sudheer Shanka
0dd17c8406 Merge "Fix description for the string disabled_by_admin." into nyc-dev 2016-03-10 01:05:37 +00:00
Sudheer Shanka
535b4e7eac Fix description for the string disabled_by_admin. 
Change-Id: I229891fd6796521fc0b84f5ae5463b8697cf0934
 2016-03-09 17:04:15 -08:00
Sudheer Shanka
a54d4be2dc Minor cleanup in RestrictedPreferenceHelper.setDisabledByAdmin. 
am: 8d774b752b

* commit '8d774b752b4f8f9ff64c23b02ec923508fe25068':
  Minor cleanup in RestrictedPreferenceHelper.setDisabledByAdmin.
 2016-03-09 22:55:28 +00:00
Sudheer Shanka
8d774b752b Minor cleanup in RestrictedPreferenceHelper.setDisabledByAdmin. 
Change-Id: I573ea3a0c4565c62d47c4458b7885a8cfbdf31cc
 2016-03-09 14:48:19 -08:00
Tony Mantler
d48e0d44f6 Remove redundant twiddling of Settings.Secure.ACCESSIBILITY_ENABLED 
This is handled by AccessibilityManagerService now

b/27477156

Change-Id: Ib55d753ec0bd07764780a126be4bb8e4a406d22d
 2016-03-09 14:28:25 -08:00
Sudheer Shanka
f271fd5199 Use compound drawable instead of image span. 
Bug: 27263531
Change-Id: Id35342c6656cd4b0f4b1756c903e9cf071293a14
 2016-03-09 14:21:07 -08:00
Sudheer Shanka
3639911335 Merge "Minor cleanup in restricted_icon." into nyc-dev 
am: d7061416eb

* commit 'd7061416eb5ccd1c89fcdbcef6b0dc95ae255365':
  Minor cleanup in restricted_icon.
 2016-03-09 17:09:16 +00:00
Sudheer Shanka
a5003092e1 Merge "Remove unused imports and variables." into nyc-dev 
am: bc58e3faa1

* commit 'bc58e3faa1d3fd3e42b647419fdf81b251fcf126':
  Remove unused imports and variables.
 2016-03-09 17:09:15 +00:00
Sudheer Shanka
d7061416eb Merge "Minor cleanup in restricted_icon." into nyc-dev 2016-03-09 17:03:38 +00:00
Sudheer Shanka
bc58e3faa1 Merge "Remove unused imports and variables." into nyc-dev 2016-03-09 17:03:33 +00:00
Sudheer Shanka
efbecddcb7 Remove unused imports and variables. 
Bug: 27564074
Change-Id: I5eff9f673fe093a9068e94619cfe7eef10c0b4a9
 2016-03-09 16:31:49 +00:00
Sudheer Shanka
65c000fd98 Minor cleanup in restricted_icon. 
android:gravity doesn't have any effect for ImageView, remove it.

Bug: 27564074

Change-Id: Icb6e5dc2bfeb0b30b2b77cb56fc7439950eadce1
 2016-03-09 16:31:28 +00:00
Jason Monk
af2f9a3262 Merge "Support updates to the data usage graph" into nyc-dev 
am: 4628b6c12a

* commit '4628b6c12aa7f712f258eb031fdbb5a608e14575':
  Support updates to the data usage graph
 2016-03-09 16:28:48 +00:00
Jason Monk
4628b6c12a Merge "Support updates to the data usage graph" into nyc-dev 2016-03-09 15:40:56 +00:00
Martijn Coenen
0bd0b80ab5 Merge "SettingsLib: Always update preference state." into nyc-dev 
am: 502bc4e7a3

* commit '502bc4e7a340b75829afdd85803005fe3dacbb88':
  SettingsLib: Always update preference state.
 2016-03-09 10:37:44 +00:00
Martijn Coenen
502bc4e7a3 Merge "SettingsLib: Always update preference state." into nyc-dev 2016-03-09 10:30:40 +00:00
Sudheer Shanka
da9aff938d Merge "Remove RestrictedDropDownPreference class." into nyc-dev 
am: e8cd832eea

* commit 'e8cd832eea94a6be152b2ccdfd9536ae1637af52':
  Remove RestrictedDropDownPreference class.
 2016-03-08 23:11:24 +00:00
Sudheer Shanka
e8cd832eea Merge "Remove RestrictedDropDownPreference class." into nyc-dev 2016-03-08 22:58:00 +00:00
Jason Monk
0193a87196 Support updates to the data usage graph 
Also make the graph a little bit more smooth.

Bug: 27278313
Change-Id: Ia9ff8a69691671c57cfaf6eb43e373a8386469ea
 2016-03-08 16:35:05 -05:00
Tobias Sargeant
68ad817d08 Merge "Increase char limit for webview multiprocess setting string" into nyc-dev 
am: 316b9ecdcf

* commit '316b9ecdcf5a9cebe8e46cb0ae46dc81c35d4cb8':
  Increase char limit for webview multiprocess setting string
 2016-03-08 17:58:45 +00:00
Tobias Sargeant
431a92d86d Increase char limit for webview multiprocess setting string 
Change-Id: I6589052461aaa7a14a83d085373fa33e5509affc
 2016-03-08 16:07:14 +00:00
Muyuan Li
83232421ca Making AccessibilityUtils interface multi-user aware 
am: 19df1284d9

* commit '19df1284d9a545df044815adf57cf5c160d306fd':
  Making AccessibilityUtils interface multi-user aware
 2016-03-07 19:41:57 +00:00
Muyuan Li
19df1284d9 Making AccessibilityUtils interface multi-user aware 
The getEnabledServices and setAccessibilityServiceState now have an
overloaded version to take in a userId parameter.

Bug: 27383941
Change-Id: I3ea648fd5f22cd2e9402686b83ca42976b5306f8
(cherry picked from commit 2d1c0154b1f9aeeb991dc96efb29aa53c76f4957)
 2016-03-07 19:08:04 +00:00
Jason Monk
7aeb2b058a Merge "Fix window insets for settings activities" into nyc-dev 
am: cea711916d

* commit 'cea711916d8c59de7174ec949360f0331c6e98ce':
  Fix window insets for settings activities
 2016-03-07 17:36:43 +00:00
Jason Monk
cea711916d Merge "Fix window insets for settings activities" into nyc-dev 2016-03-07 15:33:10 +00:00
Jason Monk
73f842917e Fix window insets for settings activities 
Bug: 27276035
Change-Id: I48d8361f38dd7b708c49e71087e3e2ebf3f2df7a
 2016-03-07 10:31:15 -05:00
Geoff Mendal
db0b359e90 Import translations. DO NOT MERGE 
Change-Id: Ic8549a10856925a33d2fde60685914c59c9ac89e
Auto-generated-cl: translation import
 2016-03-07 07:24:43 -08:00
Sudheer Shanka
32da6ae10c Remove RestrictedDropDownPreference class. 
It is not being used any more.

Change-Id: I82919eaac21138d3466a5e152d1a1a17429609d2
 2016-03-04 17:10:17 -08:00
Joe Onorato
15e93f3715 Merge changes Ib6e0e6f3,I109f04c2,Idc716000,I44c51d5f,I810b9bd5, ... into nyc-dev 
am: 5d4ab988bd

* commit '5d4ab988bd18bb1fc339f39d6f0cf225b6561903':
  Turn down the logging a little bit.
  Turn down the logging a little bit and don't do a log wrapper function.
  Turn down the logging a little bit.
  Turn down the logging a little bit.
  Turn down the logging a little bit.
  Turn down the logging a little bit.
  Turn down the logging a little bit.
 2016-03-04 21:48:35 +00:00
Joe Onorato
93dcff0122 Turn down the logging a little bit. 
Change-Id: I5760eb7d6d6ed5e8a3426e92c835e8a71e10cdbb
 2016-03-04 12:21:30 -08:00
Svet Ganov
81fb0d4acd Disallow disabling of the package installer 
bug:26426558

Change-Id: Ia40a146c37c219a6edbb5d0457b1fce45b021266
 2016-03-04 09:27:26 -08:00
Udam Saini
b104a80bbb Merge "Only adds translucent status bar according to theme values." into nyc-dev 
am: 9cf94182fc

* commit '9cf94182fce16a7de28369263b5ced06a989f71e':
  Only adds translucent status bar according to theme values.
 2016-03-03 22:08:29 +00:00