PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,101 Commits 1 Branch 0 Tags
262148ecbd004c07556e13e143c66b51b679b332
Commit Graph

28101 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shweta Chahar
5015348bfd Merge "Merge "Set the max for pitch seekbar in xml in sync with the max for pitch seekbar in TextToSpeechSettings.java" into nyc-dev am: 19c01f0351 am: 5d8a18ce2a" into nyc-mr1-dev-plus-aosp 
am: eabc81eeb9

* commit 'eabc81eeb982f1e948a7744c8bc5ddd3cc33ad0a':

Change-Id: Ia5545a31c650feb1e60bff378a85b627b33c26cd
 2016-04-29 13:39:09 +00:00
shwetachahar
b8564f03f0 Merge "Set the max for pitch seekbar in xml in sync with the max for pitch seekbar in TextToSpeechSettings.java" into nyc-dev am: 19c01f0351 am: bf4e0306bc 
am: 6105121d8c

* commit '6105121d8c9656ac33777eba9f6273c360714618':
  Set the max for pitch seekbar in xml in sync with the max for pitch seekbar in TextToSpeechSettings.java

Change-Id: I8f9988a3c80846222ea80bc7bb5a4997c2babe99
 2016-04-29 13:39:09 +00:00
Android Build Merger (Role)
eabc81eeb9 Merge "Merge "Set the max for pitch seekbar in xml in sync with the max for pitch seekbar in TextToSpeechSettings.java" into nyc-dev am: 19c01f0351 am: 5d8a18ce2a" into nyc-mr1-dev-plus-aosp 2016-04-29 13:36:57 +00:00
Shweta Chahar
2f4e7c3a31 Merge "Set the max for pitch seekbar in xml in sync with the max for pitch seekbar in TextToSpeechSettings.java" into nyc-dev am: 19c01f0351 
am: 5d8a18ce2a

* commit '5d8a18ce2addbb2304e9db6787b2e5d412aac8ee':
  Set the max for pitch seekbar in xml in sync with the max for pitch seekbar in TextToSpeechSettings.java

Change-Id: I46d54f787d0265a4329ddcbb76fcf9955f3921db
 2016-04-29 13:36:45 +00:00
Shweta Chahar
6105121d8c Merge "Set the max for pitch seekbar in xml in sync with the max for pitch seekbar in TextToSpeechSettings.java" into nyc-dev am: 19c01f0351 
am: bf4e0306bc

* commit 'bf4e0306bc9acf8fcb00df87e8f03755f0c06c7a':
  Set the max for pitch seekbar in xml in sync with the max for pitch seekbar in TextToSpeechSettings.java

Change-Id: I77472d9ba0ddce30a5e99d9b65725312521d85ec
 2016-04-29 13:36:43 +00:00
shwetachahar
bf4e0306bc Merge "Set the max for pitch seekbar in xml in sync with the max for pitch seekbar in TextToSpeechSettings.java" into nyc-dev 
am: 19c01f0351

* commit '19c01f03511610541ab80b8f565381da31d21926':
  Set the max for pitch seekbar in xml in sync with the max for pitch seekbar in TextToSpeechSettings.java

Change-Id: I0b55dd38a001726331012df441de34ba998c512f
 2016-04-29 13:34:19 +00:00
shwetachahar
5d8a18ce2a Merge "Set the max for pitch seekbar in xml in sync with the max for pitch seekbar in TextToSpeechSettings.java" into nyc-dev 
am: 19c01f0351

* commit '19c01f03511610541ab80b8f565381da31d21926':
  Set the max for pitch seekbar in xml in sync with the max for pitch seekbar in TextToSpeechSettings.java

Change-Id: If4a777002972d217fbd770c0b2f481a9934bfd41
 2016-04-29 13:34:19 +00:00
Shweta Chahar
19c01f0351 Merge "Set the max for pitch seekbar in xml in sync with the max for pitch seekbar in TextToSpeechSettings.java" into nyc-dev 2016-04-29 13:29:10 +00:00
Julia Reynolds
8bda21a9d4 Fix NPE in user settings. 
Bug: 28337026
Change-Id: I437874e8dd605b9a19318aafecf292303ee3ad58
 2016-04-29 08:42:01 -04:00
Philip P. Moltmann
625296f21d Merge "Handling of issues while migrating primary storage am: 1ec941db0c am: 4d2714fd10" into nyc-mr1-dev-plus-aosp 
am: 32023187f7

* commit '32023187f7728a6c9fee0d7a5beb06e7a7d3163e':

Change-Id: Ic67ee714889031a690f6cd9061b5eca0e637060a
 2016-04-28 23:26:29 +00:00
Philip P. Moltmann
0a1e8fa7fc Handling of issues while migrating primary storage am: 1ec941db0c am: 16d64842d9 
am: 5fd8e1b03c

* commit '5fd8e1b03cc09e438f72697308c95a1c531b2a45':
  Handling of issues while migrating primary storage

Change-Id: I1065eebd7c9b509d6bb5e932a6a819a8bc8afc86
 2016-04-28 23:26:28 +00:00
Android Build Merger (Role)
32023187f7 Merge "Handling of issues while migrating primary storage am: 1ec941db0c am: 4d2714fd10" into nyc-mr1-dev-plus-aosp 2016-04-28 23:24:21 +00:00
Philip P. Moltmann
35b60a0139 Handling of issues while migrating primary storage am: 1ec941db0c 
am: 4d2714fd10

* commit '4d2714fd10c628c8b3b060d57d428fdffcf94217':
  Handling of issues while migrating primary storage

Change-Id: If2e9111ea8c2f2b568ca23dcc935bb582b4a32cc
 2016-04-28 23:24:08 +00:00
Philip P. Moltmann
5fd8e1b03c Handling of issues while migrating primary storage am: 1ec941db0c 
am: 16d64842d9

* commit '16d64842d9b4e54f3e99a760e60918ac4f16bddf':
  Handling of issues while migrating primary storage

Change-Id: I0c817a826c44e42ab169423eac9500c92650fb7e
 2016-04-28 23:24:06 +00:00
Philip P. Moltmann
16d64842d9 Handling of issues while migrating primary storage 
am: 1ec941db0c

* commit '1ec941db0ce37a864b5aa1a92111e5c52953c33e':
  Handling of issues while migrating primary storage

Change-Id: Ic298e031e2b8b2afcfce5a4f01b34f6c7dd13b65
 2016-04-28 23:21:50 +00:00
Philip P. Moltmann
4d2714fd10 Handling of issues while migrating primary storage 
am: 1ec941db0c

* commit '1ec941db0ce37a864b5aa1a92111e5c52953c33e':
  Handling of issues while migrating primary storage

Change-Id: I95283e6b84be28c026867b47ce84a1425e8b3859
 2016-04-28 23:21:48 +00:00
Philip P. Moltmann
1ec941db0c Handling of issues while migrating primary storage 
Bug: 28177789
Change-Id: Icfbd048ddf0a1d55df1e7273d49727357b98a452
 2016-04-28 14:44:53 -07:00
Fan Zhang
a6c862caf6 Prompt sign-in when there is no account for support options 
Bug: 28141203
Bug: 28316343
Change-Id: Ie7f86955519504e5eed4af4c8406a353a3847995
 2016-04-28 14:40:07 -07:00
Julia Reynolds
63c64da912 Expand BT screen. am: 05c6a2c007 am: 8acb204098 
am: 28cca60a6a

* commit '28cca60a6a2cc7f5b717e9630a73b170960c6da1':

Change-Id: If18b9265252ebf06fc0322aae0df3a0a09e9a2a5
 2016-04-28 19:52:32 +00:00
Julia Reynolds
2ed2700799 Expand BT screen. am: 05c6a2c007 am: 8136b125f6 
am: c4fd2aa83e

* commit 'c4fd2aa83e780d871d2b48766c7811ebca1bc7ae':
  Expand BT screen.

Change-Id: I5e69dc1eac4af78d9f73e7c0b409da39aea1ccfd
 2016-04-28 19:52:31 +00:00
Julia Reynolds
28cca60a6a Expand BT screen. am: 05c6a2c007 
am: 8acb204098

* commit '8acb204098fffe65159a4332636ed2e133dd1459':

Change-Id: I2880d62010ce9a1bd70e3710f7e685ec7b65870c
 2016-04-28 19:39:47 +00:00
Julia Reynolds
c4fd2aa83e Expand BT screen. am: 05c6a2c007 
am: 8136b125f6

* commit '8136b125f66ae32f1ab64b74a225d583fb911c60':
  Expand BT screen.

Change-Id: I882414db3110576b33ef9c3d102c074880a79e93
 2016-04-28 19:37:17 +00:00
Julia Reynolds
8136b125f6 Expand BT screen. 
am: 05c6a2c007

* commit '05c6a2c007675fede50245519571879f749c8e66':
  Expand BT screen.

Change-Id: I0c3ed43962f1618b4cffe054bcff1fff0b5e0893
 2016-04-28 19:35:28 +00:00
Julia Reynolds
8acb204098 Expand BT screen. 
am: 05c6a2c007

* commit '05c6a2c007675fede50245519571879f749c8e66':
  Expand BT screen.

Change-Id: Ied5dfb76787680a4b48f62dedd657fb065f744fd
 2016-04-28 19:24:51 +00:00
Julia Reynolds
05c6a2c007 Expand BT screen. 
Bug: 27106877
Change-Id: I31100598f27d45b6a50351f14bd0d20cc6e27d9d
 2016-04-28 14:27:02 -04:00
shwetachahar
7c0bc8ed76 Set the max for pitch seekbar in xml in sync with the max for pitch 
seekbar in TextToSpeechSettings.java

Bug: 28257828
Change-Id: I8a114cf31d72eedf1ba03093364074bec7e7cdee
 2016-04-28 16:09:18 +01:00
Jason Monk
c14815790c Merge "Merge "Fix summary lifecycle" into nyc-dev am: 6e51591 am: c39a0fa" into nyc-mr1-dev-plus-aosp 
am: 49af6be

* commit '49af6be6623786ff610be9c428509966ee90f530':

Change-Id: I67cb9bd50fc130ad2ce093d8b1df31d8052e109a
 2016-04-28 15:05:03 +00:00
Jason Monk
b5829b0355 Merge "Fix summary lifecycle" into nyc-dev am: 6e51591 am: db723c9 
am: 9574c90

* commit '9574c9091bd182f4e89d9c725c6f0702968db803':
  Fix summary lifecycle

Change-Id: I82265dbc34460733cbfcd1c32d02c88d6037ae7c
 2016-04-28 15:05:02 +00:00
Android Build Merger (Role)
49af6be662 Merge "Merge "Fix summary lifecycle" into nyc-dev am: 6e51591 am: c39a0fa" into nyc-mr1-dev-plus-aosp 2016-04-28 15:01:49 +00:00
Jason Monk
dcca79b067 Merge "Fix summary lifecycle" into nyc-dev am: 6e51591 
am: c39a0fa

* commit 'c39a0fa7ce9bffeb00beb9487113a9634072fd3c':
  Fix summary lifecycle

Change-Id: Id01514e1384f96c873be22d37e00e8c76ec6d3fd
 2016-04-28 15:01:38 +00:00
Jason Monk
9574c9091b Merge "Fix summary lifecycle" into nyc-dev am: 6e51591 
am: db723c9

* commit 'db723c92211b9a6a71a0431256e7615304459dbd':
  Fix summary lifecycle

Change-Id: I04c55c1e345cbabb0de89f134df88122069e897c
 2016-04-28 15:01:37 +00:00
Jason Monk
db723c9221 Merge "Fix summary lifecycle" into nyc-dev 
am: 6e51591

* commit '6e5159185388ed97c5b1a8648c1c6f2396d124a2':
  Fix summary lifecycle

Change-Id: Ic66ba905b1f225bbfaff6db51164727a21599238
 2016-04-28 14:58:11 +00:00
Jason Monk
c39a0fa7ce Merge "Fix summary lifecycle" into nyc-dev 
am: 6e51591

* commit '6e5159185388ed97c5b1a8648c1c6f2396d124a2':
  Fix summary lifecycle

Change-Id: If5eb2ce64f152d37fc5b60c74ea2e2f28bd50a4f
 2016-04-28 14:58:11 +00:00
Jason Monk
6e51591853 Merge "Fix summary lifecycle" into nyc-dev 2016-04-28 14:51:59 +00:00
Jason Monk
8d8de14905 Fix summary lifecycle 
Once more and probably not for all

Don't let multiple listening state changes get queued, this can cause
rapid changes like listening->not listening->listening.  Also store
listening state on the worker thread now that we drop some state
messages and only notify summaries when there is a state change.

Change-Id: I93a5f364e9b35929f9088e044ebefd9be69740e6
Fixes: 28319383
 2016-04-28 10:42:10 -04:00
Jason Monk
e3612eebf3 Merge "Fix search after upgrade" into nyc-dev am: f96b594 am: 31c0cfe 
am: 8ed8488

* commit '8ed848884635c4688d7fb615e1137874650cf7ee':

Change-Id: I4d0f8a7d3323a78f0b0a621f54f3e5264535e4f1
 2016-04-28 14:37:47 +00:00
Jason Monk
8ed8488846 Merge "Fix search after upgrade" into nyc-dev am: f96b594 
am: 31c0cfe

* commit '31c0cfe2f23c045b0d76155994d6085ee4bb58a6':

Change-Id: I06bb0c22f33e9ddde016242f97809d8b17f4fb9d
 2016-04-28 14:34:11 +00:00
Jason Monk
066245deda Merge "Fix search after upgrade" into nyc-dev am: f96b594 am: 5745801 
am: d08a592

* commit 'd08a592ba3e23a20c8eac030f6a676d16c5bd964':
  Fix search after upgrade

Change-Id: I1715cb15f867573673b1ca133f2d4ba007de4f80
 2016-04-28 14:24:23 +00:00
Jason Monk
d08a592ba3 Merge "Fix search after upgrade" into nyc-dev am: f96b594 
am: 5745801

* commit '574580101438166980a47a582cde88df25ad3f81':
  Fix search after upgrade

Change-Id: Ib04ab37894535d559e7d8f7c7749f838600df46f
 2016-04-28 14:20:48 +00:00
Jason Monk
5745801014 Merge "Fix search after upgrade" into nyc-dev 
am: f96b594

* commit 'f96b5947f9122e471d7cc72847f707bc4dcc30a4':
  Fix search after upgrade

Change-Id: I5e393db4d91a59b491077ede1563bc0fe036a023
 2016-04-28 14:17:28 +00:00
Jason Monk
31c0cfe2f2 Merge "Fix search after upgrade" into nyc-dev 
am: f96b594

* commit 'f96b5947f9122e471d7cc72847f707bc4dcc30a4':
  Fix search after upgrade

Change-Id: Iba0908e1a338fc4feea5ce6c7fbbe5847cd16dcb
 2016-04-28 14:17:28 +00:00
Jason Monk
f96b5947f9 Merge "Fix search after upgrade" into nyc-dev 2016-04-28 14:13:44 +00:00
Jason Monk
18fbdd023b Fix search after upgrade 
Settings was dropping the search tables after upgrade but not
clearing the bit that says a full index has completed.

Change-Id: If49960b8cc07e72127bac211ae4d6c1f25b71c81
Fixes: 28414461
 2016-04-28 10:08:29 -04:00
Jason Monk
a272ddec1c Merge "Merge "Default payment settings to disabled" into nyc-dev am: 6b421dd am: 474cd3c" into nyc-mr1-dev-plus-aosp 
am: 97b15aa

* commit '97b15aab4fb84de662de220c28682ae9932205a7':

Change-Id: Ib61cace333a115099da3fcbd10db708c1d530e4b
 2016-04-28 13:06:14 +00:00
Jason Monk
aa2ee03465 Merge "Default payment settings to disabled" into nyc-dev am: 6b421dd am: c6d5902 
am: 5aa4861

* commit '5aa4861f2b24ba696cdd80cc193442e9c70ecdd9':
  Default payment settings to disabled

Change-Id: I7deaff2320a27a69cd74d012edb13e4fc5dad970
 2016-04-28 13:06:13 +00:00
Android Build Merger (Role)
97b15aab4f Merge "Merge "Default payment settings to disabled" into nyc-dev am: 6b421dd am: 474cd3c" into nyc-mr1-dev-plus-aosp 2016-04-28 13:03:04 +00:00
Jason Monk
bf3c447a78 Merge "Default payment settings to disabled" into nyc-dev am: 6b421dd 
am: 474cd3c

* commit '474cd3c0621ecd404fc22438ecb83b618880b3a1':
  Default payment settings to disabled

Change-Id: Idc325d493d569411f805b48fc51e6ee55711be8c
 2016-04-28 13:02:52 +00:00
Jason Monk
5aa4861f2b Merge "Default payment settings to disabled" into nyc-dev am: 6b421dd 
am: c6d5902

* commit 'c6d59023709b7e86db3b07b5e8b99c34b25f3c29':
  Default payment settings to disabled

Change-Id: I075e3be940e4cfec1582c1d4a928a269327f2431
 2016-04-28 13:02:51 +00:00
Jason Monk
c6d5902370 Merge "Default payment settings to disabled" into nyc-dev 
am: 6b421dd

* commit '6b421dd4f6250bceba673d6f86dcb48026517b01':
  Default payment settings to disabled

Change-Id: Id7db30f04e32d212fa1edc719ad0363e468bec67
 2016-04-28 12:59:34 +00:00
Jason Monk
474cd3c062 Merge "Default payment settings to disabled" into nyc-dev 
am: 6b421dd

* commit '6b421dd4f6250bceba673d6f86dcb48026517b01':
  Default payment settings to disabled

Change-Id: Ibff8616f8b6313843c28903ee2e38dce3462f076
 2016-04-28 12:59:34 +00:00