OSDN Git Service
Phil Weaver [Wed, 31 Aug 2016 22:07:25 +0000 (22:07 +0000)]
Merge "Make sure setting switch bar state is announced." into nyc-mr1-dev am:
e954b992d8 am:
caa37ab1db
am:
bab8a2587b
Change-Id: I0709fe767ec6629904381468a047b693b9290fbb
Phil Weaver [Wed, 31 Aug 2016 22:07:24 +0000 (22:07 +0000)]
Make sure setting switch bar state is announced. am:
664f6dacca am:
d8c8c632d4
am:
06c04d91c7
Change-Id: I623bd0cf15f7a1ef73393e63fd739749834910c5
Phil Weaver [Wed, 31 Aug 2016 21:38:26 +0000 (21:38 +0000)]
Merge "Make sure setting switch bar state is announced." into nyc-mr1-dev am:
e954b992d8
am:
caa37ab1db
Change-Id: I29db443dca08c53aa080f81d66f21df4218ac11c
Phil Weaver [Wed, 31 Aug 2016 21:38:26 +0000 (21:38 +0000)]
Make sure setting switch bar state is announced. am:
664f6dacca
am:
d8c8c632d4
Change-Id: I8eceb0ed685ec5101132027f547c0b577c8c459c
Phil Weaver [Wed, 31 Aug 2016 21:34:53 +0000 (21:34 +0000)]
Merge "Make sure setting switch bar state is announced." into nyc-mr1-dev
am:
e954b992d8
Change-Id: Ib39605af8243f105c94909cf0b1aa5c3680250a0
Phil Weaver [Wed, 31 Aug 2016 21:34:53 +0000 (21:34 +0000)]
Make sure setting switch bar state is announced.
am:
664f6dacca
Change-Id: I8ecc83b5affa7af17071971abee57320d1fe2333
Phil Weaver [Wed, 31 Aug 2016 21:32:07 +0000 (21:32 +0000)]
Merge "Make sure setting switch bar state is announced." into nyc-mr1-dev
Rebecca Silberstein [Wed, 31 Aug 2016 21:22:23 +0000 (21:22 +0000)]
Merge "TetherSettings: check provisionApp array length" into nyc-mr1-dev am:
3756593811 am:
2651bdcfd7
am:
dc73deeeb0
Change-Id: Ibed6d75b0bd84eaa83159a0fda96da0797c85525
Rebecca Silberstein [Wed, 31 Aug 2016 21:22:21 +0000 (21:22 +0000)]
TetherSettings: check provisionApp array length am:
39f0e41ec7 am:
02602b9b2c
am:
2534a478a6
Change-Id: Ibdd4041fb89cace2e3e9734a243ce4d85a922188
Rebecca Silberstein [Wed, 31 Aug 2016 20:51:32 +0000 (20:51 +0000)]
Merge "TetherSettings: check provisionApp array length" into nyc-mr1-dev am:
3756593811
am:
2651bdcfd7
Change-Id: I7245009917e42a9fe3d7f0eceace4ad28d2eb398
Rebecca Silberstein [Wed, 31 Aug 2016 20:51:31 +0000 (20:51 +0000)]
TetherSettings: check provisionApp array length am:
39f0e41ec7
am:
02602b9b2c
Change-Id: I51d5a3094a575254489d734c823e10608ddb369b
Rebecca Silberstein [Wed, 31 Aug 2016 20:45:21 +0000 (20:45 +0000)]
Merge "TetherSettings: check provisionApp array length" into nyc-mr1-dev
am:
3756593811
Change-Id: Iaa61a5d18148e721987df8fb1d76745b315daa85
Rebecca Silberstein [Wed, 31 Aug 2016 20:45:21 +0000 (20:45 +0000)]
TetherSettings: check provisionApp array length
am:
39f0e41ec7
Change-Id: I25e14b85e810e9423e8c89d8449e2826acb77e74
Rebecca Silberstein [Wed, 31 Aug 2016 20:28:56 +0000 (20:28 +0000)]
Merge "TetherSettings: check provisionApp array length" into nyc-mr1-dev
Todd Kennedy [Wed, 31 Aug 2016 05:19:55 +0000 (05:19 +0000)]
Merge "Implement Web Action settings" into nyc-mr1-dev am:
1721e4510f am:
5674358df2
am:
633fc08486
Change-Id: I63746ae14b8060561f10374564bd6392b3536199
Andreas Gampe [Wed, 31 Aug 2016 03:22:02 +0000 (20:22 -0700)]
resolve merge conflicts of
d30af7c to master
Change-Id: I3484e0e6c2a092f05539af569a9d9131f006ecf1
Todd Kennedy [Wed, 31 Aug 2016 02:28:38 +0000 (02:28 +0000)]
Merge "Implement Web Action settings" into nyc-mr1-dev am:
1721e4510f
am:
5674358df2
Change-Id: Ief4abbfd95bedee1826740a46d1996771687aef4
Todd Kennedy [Wed, 31 Aug 2016 02:28:38 +0000 (02:28 +0000)]
Implement Web Action settings am:
d5824967ee
am:
1fc2e5dcb7
Change-Id: I4e4976e848af3e8d12b65730147be1257fed382c
Todd Kennedy [Wed, 31 Aug 2016 02:25:37 +0000 (02:25 +0000)]
Merge "Implement Web Action settings" into nyc-mr1-dev
am:
1721e4510f
Change-Id: Ib0e0a234b0dcc3fbd6a3602977d744629b31a0ca
Todd Kennedy [Wed, 31 Aug 2016 02:25:37 +0000 (02:25 +0000)]
Implement Web Action settings
am:
d5824967ee
Change-Id: Ibd54894d1c71d835931e0b0296add2b1a010cde5
TreeHugger Robot [Wed, 31 Aug 2016 02:20:47 +0000 (02:20 +0000)]
Merge "Implement Web Action settings" into nyc-mr1-dev
Salvador Martinez [Wed, 31 Aug 2016 01:20:13 +0000 (01:20 +0000)]
Merge "Can restore state on rotate personal dict screen" into nyc-mr1-dev am:
adfcb15518 am:
6584b76a87
am:
2453fdc976
Change-Id: Ibb34c718becca596d3c404d96dcf27385d08bd97
Salvador Martinez [Wed, 31 Aug 2016 01:19:32 +0000 (01:19 +0000)]
Can restore state on rotate personal dict screen am:
8f4eb4d74b am:
45cdbd2669
am:
6b41874231
Change-Id: I426e4bfea077b3494a8a5a8e3eea0659186b60f8
Andrew Sapperstein [Wed, 31 Aug 2016 01:19:31 +0000 (01:19 +0000)]
Merge "Use LinkTextView for support disclaimer text." into nyc-dr1-dev am:
a200918af0 am:
65a8409ddc am:
f6908339fd
am:
b69b72c2ed
Change-Id: Ib42a7684e26fe75b21978cdbefe0f1072d9ab758
Andrew Sapperstein [Wed, 31 Aug 2016 01:19:30 +0000 (01:19 +0000)]
Use LinkTextView for support disclaimer text. am:
7e9146950d am:
d63e187b1a am:
c3733b8653
am:
25d10fd293
Change-Id: Ie1ac8f05cbe91dd99ea3840c02932ba98050eb91
Felipe Leme [Wed, 31 Aug 2016 01:19:29 +0000 (01:19 +0000)]
Merge "Only display System section for current user." into nyc-mr1-dev am:
c24a46128a am:
9eb3b31c29
am:
b934885f0c
Change-Id: I2905157ca66a71e6119f47ac3fc536e8b29e3fd9
Felipe Leme [Wed, 31 Aug 2016 01:19:28 +0000 (01:19 +0000)]
Only display System section for current user. am:
ce37ef51aa am:
0547440ad7
am:
3d9cb084e9
Change-Id: I5b210e644b2fcdeaa7611a373ab2dbed5db89cd2
Salvador Martinez [Wed, 31 Aug 2016 00:45:30 +0000 (00:45 +0000)]
Merge "Can restore state on rotate personal dict screen" into nyc-mr1-dev am:
adfcb15518
am:
6584b76a87
Change-Id: I48ae580a4c8d96aa479bb526a3555f062cbfe4a3
Salvador Martinez [Wed, 31 Aug 2016 00:45:29 +0000 (00:45 +0000)]
Can restore state on rotate personal dict screen am:
8f4eb4d74b
am:
45cdbd2669
Change-Id: I03d263ec9747dab3a658362e6e58370d28c92101
Salvador Martinez [Wed, 31 Aug 2016 00:43:06 +0000 (00:43 +0000)]
Merge "Can restore state on rotate personal dict screen" into nyc-mr1-dev
am:
adfcb15518
Change-Id: I968eb6945d2c276f6b7590125b50c7d48671798c
Salvador Martinez [Wed, 31 Aug 2016 00:43:06 +0000 (00:43 +0000)]
Can restore state on rotate personal dict screen
am:
8f4eb4d74b
Change-Id: I8e4a2a29474784e60eb41b356cac65fe5b86886c
Andrew Sapperstein [Wed, 31 Aug 2016 00:39:59 +0000 (00:39 +0000)]
Merge "Use LinkTextView for support disclaimer text." into nyc-dr1-dev am:
a200918af0 am:
65a8409ddc
am:
f6908339fd
Change-Id: I8c6f041be0787cb7f6b2f268a00c82b6683950ae
Andrew Sapperstein [Wed, 31 Aug 2016 00:39:59 +0000 (00:39 +0000)]
Use LinkTextView for support disclaimer text. am:
7e9146950d am:
d63e187b1a
am:
c3733b8653
Change-Id: I0ecdd164e846e6af7085ff83e8c177f085b9e958
Salvador Martinez [Wed, 31 Aug 2016 00:38:15 +0000 (00:38 +0000)]
Merge "Can restore state on rotate personal dict screen" into nyc-mr1-dev
Andrew Sapperstein [Wed, 31 Aug 2016 00:34:45 +0000 (00:34 +0000)]
Merge "Use LinkTextView for support disclaimer text." into nyc-dr1-dev am:
a200918af0
am:
65a8409ddc
Change-Id: I11631880866d49e4a69869b375779aab2c472f68
Andrew Sapperstein [Wed, 31 Aug 2016 00:34:45 +0000 (00:34 +0000)]
Use LinkTextView for support disclaimer text. am:
7e9146950d
am:
d63e187b1a
Change-Id: Iffd7cc56eb9ee612b8c86a668f4851f229b746ac
Andrew Sapperstein [Wed, 31 Aug 2016 00:28:27 +0000 (00:28 +0000)]
Merge "Use LinkTextView for support disclaimer text." into nyc-dr1-dev
am:
a200918af0
Change-Id: I7554d650756aad063d8cf091022fb2a04f823b81
Andrew Sapperstein [Wed, 31 Aug 2016 00:28:27 +0000 (00:28 +0000)]
Use LinkTextView for support disclaimer text.
am:
7e9146950d
Change-Id: Ia4a998039bfcdea3419a512d342665248f0b7ac3
Andrew Sapperstein [Wed, 31 Aug 2016 00:21:29 +0000 (00:21 +0000)]
Merge "Use LinkTextView for support disclaimer text." into nyc-dr1-dev
Phil Weaver [Tue, 30 Aug 2016 23:34:38 +0000 (16:34 -0700)]
Make sure setting switch bar state is announced.
When the switch is clicked, a TYPE_VIEW_CLICKED a11y
event is produced. It works fine if the switch bar is
clicked, but if the switch itself is clicked the event
comes from the switch, which is marked as not important
for accessibility. Re-dispatching events from the switch
as coming from the switch bar makes sure that the event
comes from a view that accessibility services can see.
Bug:
30484493
Change-Id: Ie48cc78594c64b1cc5735475e1cb5959fadaaf4a
Felipe Leme [Tue, 30 Aug 2016 22:33:50 +0000 (22:33 +0000)]
Merge "Only display System section for current user." into nyc-mr1-dev am:
c24a46128a
am:
9eb3b31c29
Change-Id: I295cabb60d2aa78e7b2cf11b02898e115c88a7fa
Felipe Leme [Tue, 30 Aug 2016 22:33:49 +0000 (22:33 +0000)]
Only display System section for current user. am:
ce37ef51aa
am:
0547440ad7
Change-Id: Ibff762a11759d8b15e5df7208636af5305ac6999
Felipe Leme [Tue, 30 Aug 2016 22:31:20 +0000 (22:31 +0000)]
Merge "Only display System section for current user." into nyc-mr1-dev
am:
c24a46128a
Change-Id: I6fe2bf073e3511c94a1c8f64cea28fa512aaa195
Felipe Leme [Tue, 30 Aug 2016 22:31:20 +0000 (22:31 +0000)]
Only display System section for current user.
am:
ce37ef51aa
Change-Id: I6f0aa56dc8ec2c10687bea442c53db1f53242f7b
TreeHugger Robot [Tue, 30 Aug 2016 22:24:15 +0000 (22:24 +0000)]
Merge "Only display System section for current user." into nyc-mr1-dev
Doris Ling [Tue, 30 Aug 2016 21:37:14 +0000 (21:37 +0000)]
Remove preference "Searching for Wi-Fi networks..." am:
b8e8485720 am:
ba7e57ec06 am:
dc8a2d2b36 am:
3bac184939
am:
aa40e5b710
Change-Id: I0501fd728da7e5d9b30a805b911de007fbd8324f
Doris Ling [Tue, 30 Aug 2016 21:37:13 +0000 (21:37 +0000)]
Remove preference "Searching for Wi-Fi networks..." am:
b8e8485720 am:
b7d9f7b83d
am:
925584fb84
Change-Id: I381bd31931d05e22f053ea9fdb822be3c91575f0
Doris Ling [Tue, 30 Aug 2016 20:25:10 +0000 (20:25 +0000)]
Remove preference "Searching for Wi-Fi networks..." am:
b8e8485720 am:
ba7e57ec06 am:
dc8a2d2b36
am:
3bac184939
Change-Id: Ic5f3d6a57753454ce5aeb64b767220ad84c4ef08
Doris Ling [Tue, 30 Aug 2016 20:16:11 +0000 (20:16 +0000)]
Remove preference "Searching for Wi-Fi networks..." am:
b8e8485720 am:
ba7e57ec06
am:
dc8a2d2b36
Change-Id: I276e37f4a49de53e996db168b022c45f18f33cea
Doris Ling [Tue, 30 Aug 2016 20:07:38 +0000 (20:07 +0000)]
Remove preference "Searching for Wi-Fi networks..." am:
b8e8485720
am:
ba7e57ec06
Change-Id: Ic2e0b0c977cf11dcca4ed87deeb8bc6fe9a27420
Doris Ling [Tue, 30 Aug 2016 20:05:09 +0000 (20:05 +0000)]
Remove preference "Searching for Wi-Fi networks..."
am:
b8e8485720
Change-Id: Ie264fbdddf2aff8b8f5f4d6aac2fc079b98c9747
Doris Ling [Tue, 30 Aug 2016 20:05:08 +0000 (20:05 +0000)]
Remove preference "Searching for Wi-Fi networks..." am:
b8e8485720
am:
b7d9f7b83d
Change-Id: I3d21413f7ee61001bae570b478871af6f95d2999
Doris Ling [Tue, 30 Aug 2016 20:01:40 +0000 (20:01 +0000)]
Remove preference "Searching for Wi-Fi networks..."
am:
b8e8485720
Change-Id: I170a0f79c0d7c89de314c81088ac8b5939ddff11
Andrew Sapperstein [Tue, 30 Aug 2016 19:54:52 +0000 (12:54 -0700)]
Use LinkTextView for support disclaimer text.
LinkTextView uses LinkAccessibilityHelper to properly handle
making links accessible.
Deleted Settings' outdated fork for the version in setupwizardlib.
Test: manual
Change-Id: I38c031f96b5be0d45e4cc1aa358f95b229f17480
Fixes:
31077012
Felipe Leme [Mon, 29 Aug 2016 21:28:56 +0000 (14:28 -0700)]
Only display System section for current user.
Otherwise it will be displayed twice on work profiles.
Change-Id: Ic7d21a57f72b9f4a254d574adce90afd7cd27b90
Test: manual verification
Fixes:
31108318
Salvador Martinez [Wed, 17 Aug 2016 18:53:14 +0000 (11:53 -0700)]
Can restore state on rotate personal dict screen
When adding/editing a word for your personal dictionary
rotating the screen could cause the language to change
back to the device default. This has been fixed.
Test: ag/
1389633, robolectric not supported in this branch.
Bug:
30874931
Change-Id: I0c8ebec5f4d5e7b23112b656c482c3b2cda7791f
Doris Ling [Tue, 30 Aug 2016 01:44:41 +0000 (18:44 -0700)]
Remove preference "Searching for Wi-Fi networks..."
When we add the preference "Searching for Wi-Fi networks...", we didn't
provide a key to the preference. As a result, each time when we get
access point update and try to show such tile, it creates a new one, and
results in multiple entries of such tile. Adding a key to the preference
will prevent the multiple entry from being added.
Test: Manual -
1. Turn wifi off and on several times, verify that there is only one entry
of "Searching for Wi-Fi networks..." when initializing the wifi access
point list.
2. Verifies that when the access point list is established, the
"Searching for Wi-Fi networks..." entry is gone.
Change-Id: Iaad329d89f8e4b52129d0661501aa34fbd956692
Change-Id: I1bfa77051e068926e8c876a89adf14d143970e7e
Fixes:
31143961
Christopher Wiley [Tue, 30 Aug 2016 04:49:59 +0000 (04:49 +0000)]
Merge commit '
87e59d0' into nyc-dev-plus-aosp am:
94473046fb
am:
66603903b3
Change-Id: I0ec61e086cf9a59cc271d53d8cf6b95c820db389
Maurice Lam [Tue, 30 Aug 2016 04:49:58 +0000 (04:49 +0000)]
Merge "Add label to redaction interstitial activity" into nyc-mr1-dev am:
23a91fb029 am:
cc04f36357
am:
f2d6a6da85
Change-Id: Ibc436f2f8180269efce803a9915be1f8aa4bfd6f
Maurice Lam [Tue, 30 Aug 2016 04:49:57 +0000 (04:49 +0000)]
Add label to redaction interstitial activity am:
05c38450e2 am:
bf4f7fdace
am:
a7cb89e177
Change-Id: I7d3e2b31070b9b13d81e57f4be554c771a0f87b8
Philip P. Moltmann [Tue, 30 Aug 2016 04:49:56 +0000 (04:49 +0000)]
Merge "Hide unused recylerview to not confuse talkback." into nyc-mr1-dev am:
5dbc933501 am:
5626726151
am:
9820925bcf
Change-Id: Iac9500ef8215fa922065967307727e0bf4256046
Philip P. Moltmann [Tue, 30 Aug 2016 04:49:55 +0000 (04:49 +0000)]
Hide unused recylerview to not confuse talkback. am:
6a6db008a9 am:
2664c2331f
am:
5bc6a57729
Change-Id: I934af4a441b19f28a30ea06b74da8df0f270072e
Christopher Wiley [Tue, 30 Aug 2016 01:12:05 +0000 (01:12 +0000)]
Merge commit '
87e59d0' into nyc-dev-plus-aosp
am:
94473046fb
Change-Id: Ia6739501f00fccd8a2363ff19d49a50d17595cba
The Android Automerger [Tue, 30 Aug 2016 01:00:30 +0000 (01:00 +0000)]
Merge commit '
87e59d0' into nyc-dev-plus-aosp
Maurice Lam [Tue, 30 Aug 2016 00:00:15 +0000 (00:00 +0000)]
Merge "Add label to redaction interstitial activity" into nyc-mr1-dev am:
23a91fb029
am:
cc04f36357
Change-Id: I9be5c629d73c8507d30222e4f0e447014e62193f
Maurice Lam [Tue, 30 Aug 2016 00:00:15 +0000 (00:00 +0000)]
Add label to redaction interstitial activity am:
05c38450e2
am:
bf4f7fdace
Change-Id: I7152656c228ee4cb306174fcbfd0f7328675038d
Maurice Lam [Mon, 29 Aug 2016 23:52:00 +0000 (23:52 +0000)]
Merge "Add label to redaction interstitial activity" into nyc-mr1-dev
am:
23a91fb029
Change-Id: Ic52ee043145f897d10f074daefdb6347694f5c67
Maurice Lam [Mon, 29 Aug 2016 23:52:00 +0000 (23:52 +0000)]
Add label to redaction interstitial activity
am:
05c38450e2
Change-Id: I34ba0a2686785bc0d3477eed06a85d66573fd87e
Maurice Lam [Mon, 29 Aug 2016 23:36:34 +0000 (23:36 +0000)]
Merge "Add label to redaction interstitial activity" into nyc-mr1-dev
Philip P. Moltmann [Mon, 29 Aug 2016 21:50:07 +0000 (21:50 +0000)]
Merge "Hide unused recylerview to not confuse talkback." into nyc-mr1-dev am:
5dbc933501
am:
5626726151
Change-Id: Ib37988e0b84256085580d05a2c1404823c16203c
Philip P. Moltmann [Mon, 29 Aug 2016 21:50:07 +0000 (21:50 +0000)]
Hide unused recylerview to not confuse talkback. am:
6a6db008a9
am:
2664c2331f
Change-Id: I0072acf08ce6365c717d89db284bf1b958c27cda
Philip P. Moltmann [Mon, 29 Aug 2016 21:42:20 +0000 (21:42 +0000)]
Merge "Hide unused recylerview to not confuse talkback." into nyc-mr1-dev
am:
5dbc933501
Change-Id: I60a8354f4d07722318dc171c33361edc9a4c9185
Philip P. Moltmann [Mon, 29 Aug 2016 21:42:19 +0000 (21:42 +0000)]
Hide unused recylerview to not confuse talkback.
am:
6a6db008a9
Change-Id: I09a366e14349d4e13ceef0bc9b0f1f0de2210a16
TreeHugger Robot [Mon, 29 Aug 2016 21:39:34 +0000 (21:39 +0000)]
Merge "Hide unused recylerview to not confuse talkback." into nyc-mr1-dev
Jason Monk [Mon, 29 Aug 2016 20:12:36 +0000 (20:12 +0000)]
Fix multiple bluetooth devices bug am:
e2428aff75 am:
716313a533 am:
3c929b5cd3 am:
7bd4a34e7e
am:
9d74183142
Change-Id: I106238372daf942da2c965172e0fcf8a23aac6d5
Jason Monk [Mon, 29 Aug 2016 20:12:34 +0000 (20:12 +0000)]
Fix multiple bluetooth devices bug am:
e2428aff75 am:
1221326124
am:
b4ad2f4eb4
Change-Id: I255a286a12f4a65aa459e88154a15e872da5be47
Jason Monk [Mon, 29 Aug 2016 19:21:19 +0000 (19:21 +0000)]
Fix multiple bluetooth devices bug am:
e2428aff75 am:
716313a533 am:
3c929b5cd3
am:
7bd4a34e7e
Change-Id: I4a3daa0005f64cd5dc30bb013ed8357c60162c70
Jason Monk [Mon, 29 Aug 2016 19:12:00 +0000 (19:12 +0000)]
Fix multiple bluetooth devices bug am:
e2428aff75 am:
716313a533
am:
3c929b5cd3
Change-Id: I82bc82ef905f9698693d039880d3e98c27f19a21
Jason Monk [Mon, 29 Aug 2016 19:05:37 +0000 (19:05 +0000)]
Fix multiple bluetooth devices bug am:
e2428aff75
am:
716313a533
Change-Id: I05f6b74325359b96e7d52dc5869d341346e9c591
Jason Monk [Mon, 29 Aug 2016 18:54:18 +0000 (18:54 +0000)]
Fix multiple bluetooth devices bug
am:
e2428aff75
Change-Id: Ia4fadb8ea7e4818dde27e3806401735622c6a516
Jason Monk [Mon, 29 Aug 2016 18:35:23 +0000 (18:35 +0000)]
Fix multiple bluetooth devices bug am:
e2428aff75
am:
1221326124
Change-Id: Iee0f60e07d1abd068f29f0473d691cabc53cc26f
Jason Monk [Mon, 29 Aug 2016 18:26:31 +0000 (18:26 +0000)]
Fix multiple bluetooth devices bug
am:
e2428aff75
Change-Id: I15a10b8260c6812dd1084420b9487497e021f11a
Philip P. Moltmann [Mon, 29 Aug 2016 17:51:25 +0000 (10:51 -0700)]
Hide unused recylerview to not confuse talkback.
Fixes:
31088913
Change-Id: I1394cec881d8a1944004a69bc787e5341f8c9ddc
Geoffrey Pitsch [Mon, 29 Aug 2016 13:39:27 +0000 (13:39 +0000)]
Merge "Only show BootSounds preference if has_boot_sounds is true." into nyc-mr1-dev am:
1ff11c5ef0 am:
cf58341082
am:
e005d2bcc9
Change-Id: Ie1f05158d2c0515b70e76712173fcfd5cff538e5
Geoffrey Pitsch [Mon, 29 Aug 2016 13:39:23 +0000 (13:39 +0000)]
Only show BootSounds preference if has_boot_sounds is true. am:
fd351eaaf1 am:
de67bc9d68
am:
93352a4451
Change-Id: I6fe28d8c40bd254458121f1bea3c23b567f36b18
Jason Monk [Mon, 25 Jul 2016 14:37:39 +0000 (10:37 -0400)]
Fix multiple bluetooth devices bug
Was bug in some code trying to handle preference animations better.
Since those animations are all disabled now, just remove everything
again and re-add it.
Change-Id: If1ce07a8f2b4144d95a95cec6ebb1b423644825a
Fixes:
29314480
(cherry picked from commit
6666f9cc37ac8f9b99c6a174b1478924ed8fc6cd)
Geoffrey Pitsch [Mon, 29 Aug 2016 13:15:58 +0000 (13:15 +0000)]
Merge "Only show BootSounds preference if has_boot_sounds is true." into nyc-mr1-dev am:
1ff11c5ef0
am:
cf58341082
Change-Id: Ib7c373b962efd4382dccccd81dceb0b0aeb27159
Geoffrey Pitsch [Mon, 29 Aug 2016 13:15:54 +0000 (13:15 +0000)]
Only show BootSounds preference if has_boot_sounds is true. am:
fd351eaaf1
am:
de67bc9d68
Change-Id: I077c3fa8247092a38b1a8aa48885221ae2198b1f
Geoffrey Pitsch [Mon, 29 Aug 2016 13:12:24 +0000 (13:12 +0000)]
Merge "Only show BootSounds preference if has_boot_sounds is true." into nyc-mr1-dev
am:
1ff11c5ef0
Change-Id: I93b33da62bdc2cbb06ab427f92193773ba1e86fe
Geoffrey Pitsch [Mon, 29 Aug 2016 13:12:23 +0000 (13:12 +0000)]
Only show BootSounds preference if has_boot_sounds is true.
am:
fd351eaaf1
Change-Id: Iac1ce93f1c9cb063162c2eab14774b720b4eb4e8
Geoffrey Pitsch [Mon, 29 Aug 2016 13:06:21 +0000 (13:06 +0000)]
Merge "Only show BootSounds preference if has_boot_sounds is true." into nyc-mr1-dev
Doris Ling [Sat, 27 Aug 2016 00:33:42 +0000 (00:33 +0000)]
Merge "Re-enable Ambient Display double tab." into nyc-mr1-dev am:
302abf2f54 am:
f4e5c9352a
am:
8f366e6e1e
Change-Id: Idba77be343a50ae11c120309e8a167da562973a8
Doris Ling [Sat, 27 Aug 2016 00:33:28 +0000 (00:33 +0000)]
Re-enable Ambient Display double tab. am:
fec320324c am:
6bc8858379
am:
5d4c701707
Change-Id: I01c2e3a4a207f0338744228171a0cee7ff6bfbab
Doris Ling [Sat, 27 Aug 2016 00:10:56 +0000 (00:10 +0000)]
Merge "Re-enable Ambient Display double tab." into nyc-mr1-dev am:
302abf2f54
am:
f4e5c9352a
Change-Id: I92607b84437ad84feb4e204c60f1fc2901be6ff8
Doris Ling [Sat, 27 Aug 2016 00:10:52 +0000 (00:10 +0000)]
Re-enable Ambient Display double tab. am:
fec320324c
am:
6bc8858379
Change-Id: I175e52946e1c11bafcb4376572bcce31f2e21538
Doris Ling [Sat, 27 Aug 2016 00:07:32 +0000 (00:07 +0000)]
Merge "Re-enable Ambient Display double tab." into nyc-mr1-dev
am:
302abf2f54
Change-Id: I4aac43d3f5bf6c2bafda59dc16013a65e5c7e953
Doris Ling [Sat, 27 Aug 2016 00:07:31 +0000 (00:07 +0000)]
Re-enable Ambient Display double tab.
am:
fec320324c
Change-Id: I0fb3bb11e0c6d9b10a095ea1d8cf45c62afaa8e4
Doris Ling [Sat, 27 Aug 2016 00:04:19 +0000 (00:04 +0000)]
Merge "Re-enable Ambient Display double tab." into nyc-mr1-dev
Doris Ling [Fri, 26 Aug 2016 23:03:39 +0000 (23:03 +0000)]
Fix NullPointerException in DashboardSummary. am:
797dd7440d am:
454dc3739a
am:
45a821105f
Change-Id: I39623232f80a9de2d2199af11585eaa61bce2e08
Salvador Martinez [Fri, 26 Aug 2016 23:03:38 +0000 (23:03 +0000)]
Merge "Updated Nexus imprint screen" into nyc-mr1-dev am:
96fb5d795f am:
e8d96b5700
am:
7e9e51c2c2
Change-Id: Ide6b43f105cbcc4e8b639750c2cafc2d5a50da11