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
Noah Wang
0b420fdad1
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
* commit '1c94e6dd90288d16a1ea2b2d132f5b7e4c2f7ddc':
Fix preview screen crashing and glitches for Display / Font size Bug: 28223545 Bug: 28223533 Bug: 28210654 Bug: 28210242 Bug: 28208955 Bug: 27699996
Change-Id: If80159aeef6a321f7c278700db217b6491a9a3d4
2016-04-19 18:11:09 +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
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
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
693bb7fcb1
Merge "Merge "Guard against app info crash" into nyc-dev am: c3ab03e am: 9f6fcdf" into nyc-mr1-dev-plus-aosp
...
am: 647e70f
* commit '647e70f5c12cdf860f01f12af6979c9634c0bc75':
Change-Id: I0ff29433507bbde2f8d48d64d6c243f09d252d79
2016-04-19 13:57:28 +00: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
Android Build Merger (Role)
647e70f5c1
Merge "Merge "Guard against app info crash" into nyc-dev am: c3ab03e am: 9f6fcdf" into nyc-mr1-dev-plus-aosp
2016-04-19 13:51:11 +00:00
Jason Monk
5d124ea344
Merge "Guard against app info crash" into nyc-dev am: c3ab03e
...
am: 9f6fcdf
* commit '9f6fcdf0d7cda838a9072f7c912fd5a5b6bb5129':
Guard against app info crash
Change-Id: Iac16ff08c6fe12acbce8cb9ccf0401fcf2722690
2016-04-19 13:51:02 +00:00
Jason Monk
fec910e998
Merge "Guard against app info crash" into nyc-dev am: c3ab03e
...
am: 8379c3f
* commit '8379c3f603628ebcdfface78643e8fffe3fe08b8':
Guard against app info crash
Change-Id: I4d5434eaa5770b6582878f5e593086e82e991eaf
2016-04-19 13:51:01 +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
9f6fcdf0d7
Merge "Guard against app info crash" into nyc-dev
...
am: c3ab03e
* commit 'c3ab03ecdb505114770cbb87b61457fabf75847f':
Guard against app info crash
Change-Id: I313465d83efc950527b1634e2bc6609e6ea8e7cf
2016-04-19 13:45:18 +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
96378672d0
Merge "Merge "Apply policy transparency to HotspotCondition and WiFi settings..." into nyc-dev am: 295f106 am: 9c8d099" into nyc-mr1-dev-plus-aosp
...
am: b927b14
* commit 'b927b145afa85056d718fb7d3eb56ad08e06c0a2':
Change-Id: I2f7a110044e2ee2102f45f5f21e4c6214e17e213
2016-04-19 13:38:35 +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
Android Build Merger (Role)
b927b145af
Merge "Merge "Apply policy transparency to HotspotCondition and WiFi settings..." into nyc-dev am: 295f106 am: 9c8d099" into nyc-mr1-dev-plus-aosp
2016-04-19 13:35:30 +00:00
Zoltan Szatmary-Ban
55460e3a7d
Merge "Apply policy transparency to HotspotCondition and WiFi settings..." into nyc-dev am: 295f106
...
am: 9c8d099
* commit '9c8d099f440abad2eacb150ebd225689cc87021e':
Apply policy transparency to HotspotCondition and WiFi settings...
Change-Id: I81895bb3e3e53229241f3673d6c71b070d9c639e
2016-04-19 13:35:21 +00:00
Zoltan Szatmary-Ban
c82afdc5dc
Merge "Apply policy transparency to HotspotCondition and WiFi settings..." into nyc-dev am: 295f106
...
am: f89218e
* commit 'f89218e2812e702567d78aa5459cde1877d4c0e2':
Apply policy transparency to HotspotCondition and WiFi settings...
Change-Id: Ib9717c52c2c9356d81cb48cdf5e24f7a64ce35fd
2016-04-19 13:35:20 +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
9c8d099f44
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: I97559de43f49df91af5f8ef1c9a2bd6c968f7f0e
2016-04-19 13:32:19 +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
b7cff16cb6
Merge "Merge "Input Settings: Change the \'add\' icon." into nyc-dev am: 8aa7cf1 am: 5749a18" into nyc-mr1-dev-plus-aosp
...
am: 44dea6c
* commit '44dea6cbc2781925e574fbb2e8c5e218b03c49e6':
Change-Id: Ic2bc148498c850fde004e7a75a02264829f9fbae
2016-04-19 11:09:25 +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
Android Build Merger (Role)
44dea6cbc2
Merge "Merge "Input Settings: Change the \'add\' icon." into nyc-dev am: 8aa7cf1 am: 5749a18" into nyc-mr1-dev-plus-aosp
2016-04-19 11:06:20 +00:00
Abodunrinwa Toki
ea91db989b
Merge "Input Settings: Change the \'add\' icon." into nyc-dev am: 8aa7cf1
...
am: 5749a18
* commit '5749a18b8c0934dc727784dc6346a89379b7dcbf':
Input Settings: Change the 'add' icon.
Change-Id: I12d2f6d99b91b1e4c283359cfb6eb866e259132b
2016-04-19 11:06:11 +00:00
Abodunrinwa Toki
8d0c5fa82b
Merge "Input Settings: Change the \'add\' icon." into nyc-dev am: 8aa7cf1
...
am: f0fa52e
* commit 'f0fa52ea6824eac7cd961023b8fcc0cdde9e0c27':
Input Settings: Change the 'add' icon.
Change-Id: I9d6c03250f8f7df566c1665c187d055c13ef4a26
2016-04-19 11:06:10 +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
5749a18b8c
Merge "Input Settings: Change the \'add\' icon." into nyc-dev
...
am: 8aa7cf1
* commit '8aa7cf16310366b48489f3d3a7a4acd0fa47b8a1':
Input Settings: Change the 'add' icon.
Change-Id: I1f783e46cc86e1992bf345f900acc1dc720113dd
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
f9eb1c2c47
Merge "Merge "Fix: SpellChecker subtype label cannot be updated." into nyc-dev am: 23f7dab am: 0ed84f4" into nyc-mr1-dev-plus-aosp
...
am: 1101b8e
* commit '1101b8e85e25b5cfc9b48a341b7bbe359ee7a212':
Change-Id: I35f35e78b9025ea7879cc719de7b2a42222e8e93
2016-04-19 04:27:05 +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
Android Build Merger (Role)
1101b8e85e
Merge "Merge "Fix: SpellChecker subtype label cannot be updated." into nyc-dev am: 23f7dab am: 0ed84f4" into nyc-mr1-dev-plus-aosp
2016-04-19 04:24:49 +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
e1a29c90df
Merge "Fix: SpellChecker subtype label cannot be updated." into nyc-dev am: 23f7dab
...
am: 0ed84f4
* commit '0ed84f431a13b6e3098b5c62c895b660d67abb4e':
Fix: SpellChecker subtype label cannot be updated.
Change-Id: Ic2fa6c225ba844cef7abee913ac931f8578bd807
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
7a1480f162
Merge "Fix: SpellChecker subtype label cannot be updated." into nyc-dev
...
am: 23f7dab
* commit '23f7dab2b6ec7c763dc873314da38bd918f4161e':
Fix: SpellChecker subtype label cannot be updated.
Change-Id: I8bb2d31c8dc17d7b4bcb8a840dadf1cd442bd5ad
2016-04-19 04:22:07 +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
fa28dc7b19
Handle blacklisted apps on Data Saver whitelist. am: c2ef27f am: 90a3102
...
am: c7f2887
* commit 'c7f2887715605e0878e96d830c25de4cf65103fb':
Change-Id: I3f57d0b810f635685c2ec71fa6e52f7947404f56
2016-04-18 22:53:22 +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
c7f2887715
Handle blacklisted apps on Data Saver whitelist. am: c2ef27f
...
am: 90a3102
* commit '90a3102abd5408c0b355a495ef1cba0547c81c34':
Change-Id: If8c68de1d00f1bc08f5d3f9ace387bda8e757651
2016-04-18 22:50:14 +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
004a33f8e9
Handle blacklisted apps on Data Saver whitelist.
...
am: c2ef27f
* commit 'c2ef27faf4afca6c4f6634b5de975a1bdadf0752':
Handle blacklisted apps on Data Saver whitelist.
Change-Id: Ia5027825b7292f15717a47ed82f242f252ac83d9
2016-04-18 22:38:26 +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
2fbb297be8
Merge "Use IME service logo or icon if exists." into nyc-dev am: bd06816 am: 47e43e0
...
am: 4452d42
* commit '4452d42016271e7b81e3143840744a4f08ee32c0':
Change-Id: I189f00fcb6249ceec170212ec8e6f7739feb6367
2016-04-18 19:30:13 +00: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
4452d42016
Merge "Use IME service logo or icon if exists." into nyc-dev am: bd06816
...
am: 47e43e0
* commit '47e43e0f0dbbbe5919ea1799a0b206802cfda1ac':
Change-Id: I3f867b1645b869f0af4e71452870013f598881a0
2016-04-18 19:29:40 +00:00