Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,029 Commits 1 Branch 0 Tags
0f1ca5092ecd446ac4fe16adb252372780a8ffa8
Commit Graph

11643 Commits

Author SHA1 Message Date
Felipe Leme
0f1ca5092e Merge "Fixed AccessPreference listener." into nyc-dev am: 40c228d am: c838707 
am: 51ea751

* commit '51ea751ff58dba8a18c358098cf1b09d2d29443b':
  Fixed AccessPreference listener.

Change-Id: Idca75d7862d13502d084e6770b00f21cc5950932
 2016-04-19 19:02:06 +00:00
TreeHugger Robot
51ea751ff5 Merge "Fixed AccessPreference listener." into nyc-dev am: 40c228d 
am: c838707

* commit 'c8387072eefd1871b34ac373f986c441b909b5bd':
  Fixed AccessPreference listener.

Change-Id: I00f43d6145d7de3cc5ee73a3a231f49dd951d922
 2016-04-19 18:59:31 +00:00
Victor Chang
9c751b518f Merge "Remove reference to @string/ssl_ca_cert_dialog_title" into nyc-dev am: 04a01b7 am: f766cc8 
am: ad8d93c

* commit 'ad8d93ce4f50c5d91bc1df2cebffce1c85e34040':
  Remove reference to @string/ssl_ca_cert_dialog_title

Change-Id: I82a727d2c3f436f6292f6c7f4a12c5d0f7853bdb
 2016-04-19 18:49:26 +00:00
Victor Chang
ad8d93ce4f Merge "Remove reference to @string/ssl_ca_cert_dialog_title" into nyc-dev am: 04a01b7 
am: f766cc8

* commit 'f766cc83951fff0c26ca57b074693ef8a4775283':
  Remove reference to @string/ssl_ca_cert_dialog_title

Change-Id: Iadbd090b2a15b91137e170b7a22827d7fb3293e0
 2016-04-19 18:42:48 +00:00
Jason Monk
0c0069fed1 Merge "Fix account screen in split screen" into nyc-dev am: 43059b7 am: 4619c9c 
am: 50d03f4

* commit '50d03f4f654e0ce900eaa4201c732eb6c8392cef':
  Fix account screen in split screen

Change-Id: I03a079678ddad2a0e9093e848621604b0992aaf6
 2016-04-19 18:41:36 +00:00
TreeHugger Robot
40c228d989 Merge "Fixed AccessPreference listener." into nyc-dev 2016-04-19 18:41:06 +00:00
Victor Chang
04a01b7cc7 Merge "Remove reference to @string/ssl_ca_cert_dialog_title" into nyc-dev 2016-04-19 18:29:16 +00:00
Jason Monk
4619c9cf4a Merge "Fix account screen in split screen" into nyc-dev 
am: 43059b7

* commit '43059b7e7c0b2ca89088a3e73799cdbba2c3e90d':
  Fix account screen in split screen

Change-Id: Ic0bf62fedbeca0800fd807ee7c5839fa564fbd42
 2016-04-19 18:22:29 +00:00
Noah Wang
f2ff8893ff Merge "Fix preview screen crashing and glitches for Display / Font size Bug: 28223545 Bug: 28223533 Bug: 28210654 Bug: 28210242 Bug: 28208955 Bug: 27699996" into nyc-dev am: 4f63bb6 am: 1c94e6d 
am: 0b420fd

* commit '0b420fdad1d020ed20effc6230378074b03f7547':
  Fix preview screen crashing and glitches for Display / Font size Bug: 28223545 Bug: 28223533 Bug: 28210654 Bug: 28210242 Bug: 28208955 Bug: 27699996

Change-Id: I0e02bc9da6da571079ec560ab89a64c1283e8586
 2016-04-19 18:21:55 +00:00
Jason Monk
43059b7e7c Merge "Fix account screen in split screen" into nyc-dev 2016-04-19 18:09:27 +00:00
Noah Wang
1c94e6dd90 Merge "Fix preview screen crashing and glitches for Display / Font size Bug: 28223545 Bug: 28223533 Bug: 28210654 Bug: 28210242 Bug: 28208955 Bug: 27699996" into nyc-dev 
am: 4f63bb6

* commit '4f63bb69f5f63a19e0fdf03b1c240bd6d12d0ce1':
  Fix preview screen crashing and glitches for Display / Font size Bug: 28223545 Bug: 28223533 Bug: 28210654 Bug: 28210242 Bug: 28208955 Bug: 27699996

Change-Id: Ie9845c3f043d9fcb0733fe7204696b5792d8e9d9
 2016-04-19 18:07:20 +00:00
Jason Monk
74bd0c87be Fix account screen in split screen 
Don't remove all prefs in on pause, because why would you...

Change-Id: I9139dabf917b05860e738dc0b2aa19df8f983a7e
Fixes: 27987782
 2016-04-19 14:06:24 -04:00
Noah Wang
4f63bb69f5 Merge "Fix preview screen crashing and glitches for Display / Font size Bug: 28223545 Bug: 28223533 Bug: 28210654 Bug: 28210242 Bug: 28208955 Bug: 27699996" into nyc-dev 2016-04-19 17:56:50 +00:00
Fan Zhang
6fca010cd6 Merge "Request SupportFeatureProvider to provide a support tab." 2016-04-19 17:13:16 +00:00
Felipe Leme
11b06ca8bf Fixed AccessPreference listener. 
When an app is blacklisted, its switch toggle is disabled, but previous
the onClick() method was still being called, which would launch the data
usage screen but also call setIsWhitelist().

BUG: 27481520
Change-Id: Id8df3d65eee286d1aecb4ae2a0417d6932d91441
 2016-04-19 10:05:08 -07:00
Victor Chang
e8a46f2838 Remove reference to @string/ssl_ca_cert_dialog_title 
Bug: 28263186
Change-Id: I2e1c7d30d1fff49b2103acec90769edf4b61911b
 2016-04-19 17:47:58 +01:00
Fan Zhang
bd1c27ee1e Request SupportFeatureProvider to provide a support tab. 
Bug: 28139604

In dashboard container, if supportFeatureProvider is able to provide a
tab, we display it in tabbed layout. Otherwise, display just
DashboardSummary without changing UI.

Change-Id: Ib7601ac925e1315e6b0928d020fe2d09bd389cd7
 2016-04-19 08:30:20 -07:00
Jason Monk
2a4eba14fa Merge "Guard against app info crash" into nyc-dev am: c3ab03e am: 8379c3f 
am: fec910e

* commit 'fec910e998654eb523f9b61dbc0f14d1361b55a7':
  Guard against app info crash

Change-Id: I215b7d4928f3a0ba9c4f3d9ae08f367cba6a1ad2
 2016-04-19 13:57:28 +00:00
Jason Monk
8379c3f603 Merge "Guard against app info crash" into nyc-dev 
am: c3ab03e

* commit 'c3ab03ecdb505114770cbb87b61457fabf75847f':
  Guard against app info crash

Change-Id: Id1cea6852ef79ddaafb79764c8c4c18cf077d0c5
 2016-04-19 13:45:31 +00:00
Jason Monk
c3ab03ecdb Merge "Guard against app info crash" into nyc-dev 2016-04-19 13:38:38 +00:00
Zoltan Szatmary-Ban
f533314aad Merge "Apply policy transparency to HotspotCondition and WiFi settings..." into nyc-dev am: 295f106 am: f89218e 
am: c82afdc

* commit 'c82afdc5dc24d311b29bcbcc6889924d8b39ef2c':
  Apply policy transparency to HotspotCondition and WiFi settings...

Change-Id: I13deb3633ef6c6606498f8152f6395c37a015f90
 2016-04-19 13:38:35 +00:00
Zoltan Szatmary-Ban
f89218e281 Merge "Apply policy transparency to HotspotCondition and WiFi settings..." into nyc-dev 
am: 295f106

* commit '295f1060e990299fec7e2aa375064f9f09246e8d':
  Apply policy transparency to HotspotCondition and WiFi settings...

Change-Id: Ia7518fe9369e9f045ca120d1cb91ca81db0a5836
 2016-04-19 13:32:20 +00:00
Zoltan Szatmary-Ban
295f1060e9 Merge "Apply policy transparency to HotspotCondition and WiFi settings..." into nyc-dev 2016-04-19 13:25:22 +00:00
Abodunrinwa Toki
0893f1f56b Merge "Input Settings: Change the \'add\' icon." into nyc-dev am: 8aa7cf1 am: f0fa52e 
am: 8d0c5fa

* commit '8d0c5fa82b4371902fee1aae21eb6839c7ba64a4':
  Input Settings: Change the 'add' icon.

Change-Id: I6f0bb57b943e7c5132de851c4484161d7b65cc6b
 2016-04-19 11:09:24 +00:00
Abodunrinwa Toki
f0fa52ea68 Merge "Input Settings: Change the \'add\' icon." into nyc-dev 
am: 8aa7cf1

* commit '8aa7cf16310366b48489f3d3a7a4acd0fa47b8a1':
  Input Settings: Change the 'add' icon.

Change-Id: Ic7d0870e1862a2ff378832b1600075d3aec6f059
 2016-04-19 11:03:17 +00:00
Abodunrinwa Toki
8aa7cf1631 Merge "Input Settings: Change the 'add' icon." into nyc-dev 2016-04-19 10:56:35 +00:00
Keisuke Kuroyanagi
189951d104 Merge "Fix: SpellChecker subtype label cannot be updated." into nyc-dev am: 23f7dab am: 7a1480f 
am: 482bd60

* commit '482bd60cbfdf9c9350c8c4486a40e44a9ec852c2':
  Fix: SpellChecker subtype label cannot be updated.

Change-Id: I83f089557ac9de5c600b657fd8da20979e1e0a07
 2016-04-19 04:27:05 +00:00
Keisuke Kuroyanagi
482bd60cbf Merge "Fix: SpellChecker subtype label cannot be updated." into nyc-dev am: 23f7dab 
am: 7a1480f

* commit '7a1480f162b05315e26fcd04295ca6c11f364b72':
  Fix: SpellChecker subtype label cannot be updated.

Change-Id: I4f8749044aa3e3c1f5f79eda8d2f3acecdf54083
 2016-04-19 04:24:39 +00:00
Keisuke Kuroyanagi
0ed84f431a Merge "Fix: SpellChecker subtype label cannot be updated." into nyc-dev 
am: 23f7dab

* commit '23f7dab2b6ec7c763dc873314da38bd918f4161e':
  Fix: SpellChecker subtype label cannot be updated.

Change-Id: I75798e2d7211c8161bda142223d4f1be0d2e005c
 2016-04-19 04:22:08 +00:00
Keisuke Kuroyanagi
23f7dab2b6 Merge "Fix: SpellChecker subtype label cannot be updated." into nyc-dev 2016-04-19 04:17:02 +00:00
Felipe Leme
b2ada34cbe Handle blacklisted apps on Data Saver whitelist. am: c2ef27f am: 004a33f 
am: 52e92fd

* commit '52e92fd6c429960c4434c1736215255b57271d9a':
  Handle blacklisted apps on Data Saver whitelist.

Change-Id: I548b211925145174681ae74c606c92b0fb0e6dee
 2016-04-18 22:53:21 +00:00
Felipe Leme
52e92fd6c4 Handle blacklisted apps on Data Saver whitelist. am: c2ef27f 
am: 004a33f

* commit '004a33f8e9bb66cfd0bcaf1e1aa8d4c238be45e5':
  Handle blacklisted apps on Data Saver whitelist.

Change-Id: Ia71178dfff5f27ff495cf5b5f884383ac15607d8
 2016-04-18 22:42:43 +00:00
Felipe Leme
90a3102abd Handle blacklisted apps on Data Saver whitelist. 
am: c2ef27f

* commit 'c2ef27faf4afca6c4f6634b5de975a1bdadf0752':
  Handle blacklisted apps on Data Saver whitelist.

Change-Id: Ia221750b24003af71c6dd106b1247d7178573cf4
 2016-04-18 22:38:41 +00:00
Felipe Leme
c2ef27faf4 Handle blacklisted apps on Data Saver whitelist. 
When user blacklists an app for background data access, the
"Unrestricted data access" list should not display the whitelist toggle
option, but rather explain background access is turned off and offer the
option to open the app's data usage screen to turn it back on.

It still does not handle changed received by DataSaverBackend, so the UI
will be stale when the user removes a blacklist and navigates back to
the list.

BUG: 27481520

Change-Id: I9d0fa9f0180a69ce9bd1417921bf89ec3ba31f01
 2016-04-18 13:14:01 -07:00
Noah Wang
35a95617fd Fix preview screen crashing and glitches for 
Display / Font size
Bug: 28223545
Bug: 28223533
Bug: 28210654
Bug: 28210242
Bug: 28208955
Bug: 27699996

Change-Id: I80339dabbd089db8a6c6a80645baabb9b4cad00e
 2016-04-18 13:08:56 -07:00
Jason Monk
198d9f1cba Guard against app info crash 
Change-Id: Ifb52ec61718723202e5ec7da5f9723a4764968ba
Fixes: 28171829
 2016-04-18 15:47:01 -04:00
Yohei Yukawa
67366ac535 Merge "Use IME service logo or icon if exists." into nyc-dev am: bd06816 am: fb9ff81 
am: 8de5e7d

* commit '8de5e7dc467f2a3a77dbd8fa6c5e50d54f460fc0':
  Use IME service logo or icon if exists.

Change-Id: I27d8213d15c86e996b7c3640eea6a87efe5795cc
 2016-04-18 19:30:12 +00:00
Yohei Yukawa
fb9ff81d2d Merge "Use IME service logo or icon if exists." into nyc-dev 
am: bd06816

* commit 'bd068163e36ed470a34655025cd01324540ab6e2':
  Use IME service logo or icon if exists.

Change-Id: Idf451086fba5e3cf8d31fe5904564340c482711a
 2016-04-18 19:19:02 +00:00
Yohei Yukawa
bd068163e3 Merge "Use IME service logo or icon if exists." into nyc-dev 2016-04-18 19:01:28 +00:00
Andrew Sapperstein
e8f1dd9eab Merge "Remove ToastController." 2016-04-18 18:46:46 +00:00
shwetachahar
ca5e72e43d Merge "Set the minimum speech rate to a value of ten instead of zero." into nyc-dev am: 8852b82 am: c01beed 
am: 57c1b9c

* commit '57c1b9c995a59852cfe20a3e84d275c52fe5454f':
  Set the minimum speech rate to a value of ten instead of zero.

Change-Id: Ibb93c92f04a2b7266918c746c382e2d4aef0f01d
 2016-04-18 18:41:43 +00:00
shwetachahar
c01beed396 Merge "Set the minimum speech rate to a value of ten instead of zero." into nyc-dev 
am: 8852b82

* commit '8852b823a41df9340b8fa8a84ee577dbef9e244b':
  Set the minimum speech rate to a value of ten instead of zero.

Change-Id: I56be44e770a536c0ee41019e6864d41ceccf1fd0
 2016-04-18 18:29:47 +00:00
Daniel Nishi
781ad72bc7 Merge "Add a deletion helper view for clearing space." 2016-04-18 16:43:26 +00:00
shwetachahar
d6fb2cd724 Set the minimum speech rate to a value of ten instead of zero. 
Bug: 27093805
Change-Id: I090a9345c3b05937d1f790ea051945ac187ddb61
 2016-04-18 16:39:53 +01:00
shwetachahar
3f7c85eb79 Merge "Add a button to reset pitch to default value." into nyc-dev am: da4ecea am: 3cf8d61 
am: a961b00

* commit 'a961b006c411af203f62cbff61ed1cf13264b402':
  Add a button to reset pitch to default value.

Change-Id: I87f2d329fd04a57e3cb3af5e734227064a3fea93
 2016-04-18 15:34:24 +00:00
shwetachahar
3cf8d61458 Merge "Add a button to reset pitch to default value." into nyc-dev 
am: da4ecea

* commit 'da4ecea84517b4071bef3ae6c6b1eb180a890008':
  Add a button to reset pitch to default value.

Change-Id: Ib8be9f4d0d5ff5b2a028ab83df3b271b6377b30c
 2016-04-18 15:22:54 +00:00
shwetachahar
dd49d0308d Merge "Replace the try catch block for retrieving pitch and speech rate values from secure settings with getInt() supplied with a default arg. Also, set the pitch and speech rate of the TTS engine to the default rate and pitch when initSetting() is called." into nyc-dev am: abef602 am: 82f3228 
am: 94e6245

* commit '94e6245a809cd5b8e8bef25f36fb1ebd841ab447':
  Replace the try catch block for retrieving pitch and speech rate values from secure settings with getInt() supplied with a default arg. Also, set the pitch and speech rate of the TTS engine to the default rate and pitch when initSetting() is called.

Change-Id: I78cbd3a39973e38d81640b994858690e6e90c8ae
 2016-04-18 15:15:01 +00:00
Shweta Chahar
da4ecea845 Merge "Add a button to reset pitch to default value." into nyc-dev 2016-04-18 15:14:24 +00:00
shwetachahar
82f32288c1 Merge "Replace the try catch block for retrieving pitch and speech rate values from secure settings with getInt() supplied with a default arg. Also, set the pitch and speech rate of the TTS engine to the default rate and pitch when initSetting() is called." into nyc-dev 
am: abef602

* commit 'abef602337c8d362021ebeaf081ff3ca8a2a61f8':
  Replace the try catch block for retrieving pitch and speech rate values from secure settings with getInt() supplied with a default arg. Also, set the pitch and speech rate of the TTS engine to the default rate and pitch when initSetting() is called.

Change-Id: I2fae21bd484ef457b86494ca9e95742c48a03d10
 2016-04-18 15:04:55 +00:00
Shweta Chahar
abef602337 Merge "Replace the try catch block for retrieving pitch and speech rate values from secure settings with getInt() supplied with a default arg. Also, set the pitch and speech rate of the TTS engine to the default rate and pitch when initSetting() is called." into nyc-dev 2016-04-18 14:56:51 +00:00