Dianne Hackborn
e649ce8138
am 735e8576: Merge "Maybe fix issue #5340190 : java.lang.RuntimeException: Unable to start..."
...
* commit '735e85769f10966267afd490204de6e388307fe5':
Maybe fix issue #5340190 : java.lang.RuntimeException: Unable to start...
2011-09-19 13:36:08 -07:00
Dianne Hackborn
735e85769f
Merge "Maybe fix issue #5340190 : java.lang.RuntimeException: Unable to start..."
2011-09-19 13:34:15 -07:00
Dianne Hackborn
2ee1ffb144
Maybe fix issue #5340190 : java.lang.RuntimeException: Unable to start...
...
...activity ComponentInfo{com.google.android.apps.genie.geniewidget
Caused by: android.content.res.Resources$NotFoundException: Resource is not a ColorStateList (color or path): TypedValue{t=0x2/d=0x1010351 a=1}
at android.content.res.Resources.loadColorStateList(Resources.java:2042)
at android.content.res.TypedArray.getColorStateList(TypedArray.java:342)
at android.widget.TextView.<init>(TextView.java:763)
at android.widget.EditText.<init>(EditText.java:58)
at android.widget.EditText.<init>(EditText.java:54)
at android.preference.EditTextPreference.<init>(EditTextPreference.java:56)
at android.preference.EditTextPreference.<init>(EditTextPreference.java:71)
Change-Id: I55470759c8d08521630c7afaf4b303836c8011e0
2011-09-19 13:18:42 -07:00
Gilles Debunne
9dcf4762f7
am c630eb6a: Merge "Bug 5290461: change voice IME underline span color"
...
* commit 'c630eb6a9ae3e3a088223263ae2ee5213c7614b4':
Bug 5290461: change voice IME underline span color
2011-09-19 10:51:29 -07:00
Gilles Debunne
c630eb6a9a
Merge "Bug 5290461: change voice IME underline span color"
2011-09-19 10:50:16 -07:00
Fred Quintana
9bb9cdd17f
am 45ae3e50: am 79a33ad4: Merge "Continuation of the unified account chooser flow." into ics-factoryrom
...
* commit '45ae3e50ec8672a85edfd89827334987d0862ee0':
Continuation of the unified account chooser flow.
2011-09-19 10:47:44 -07:00
Fred Quintana
45ae3e50ec
am 79a33ad4: Merge "Continuation of the unified account chooser flow." into ics-factoryrom
...
* commit '79a33ad49e8dd54f36ea7ea5f1a275bf38daf5e8':
Continuation of the unified account chooser flow.
2011-09-19 10:46:03 -07:00
Fred Quintana
79a33ad49e
Merge "Continuation of the unified account chooser flow." into ics-factoryrom
2011-09-19 10:43:59 -07:00
Amith Yamasani
2da3f88571
am 4943b3aa: Merge "Make Volume control non-modal and allow touches underneath to take effect."
...
* commit '4943b3aa360033c0eae9e5b67c7491b25ea9ae07':
Make Volume control non-modal and allow touches underneath to take effect.
2011-09-19 10:06:02 -07:00
Amith Yamasani
4943b3aa36
Merge "Make Volume control non-modal and allow touches underneath to take effect."
2011-09-19 10:03:14 -07:00
Justin Ho
333cab9351
am b9285599: am 31f971b5: Merge "Properly adding scrubber pressed/selected state" into ics-factoryrom
...
* commit 'b9285599ab7cb9f735ab57821c30a841a5170eba':
Properly adding scrubber pressed/selected state
2011-09-19 09:44:03 -07:00
Adam Powell
60b4ac64ba
am 932ec7de: Merge "Fix bug 5279720 - Legacy theme EditText coloring"
...
* commit '932ec7deaddbd958229693d96e481c88c9afe124':
Fix bug 5279720 - Legacy theme EditText coloring
2011-09-19 09:43:59 -07:00
Justin Ho
b9285599ab
am 31f971b5: Merge "Properly adding scrubber pressed/selected state" into ics-factoryrom
...
* commit '31f971b57f526e2688241080b30c7e8df33bf62d':
Properly adding scrubber pressed/selected state
2011-09-18 16:58:20 -07:00
Justin Ho
31f971b57f
Merge "Properly adding scrubber pressed/selected state" into ics-factoryrom
2011-09-18 16:56:12 -07:00
Adam Powell
932ec7dead
Merge "Fix bug 5279720 - Legacy theme EditText coloring"
2011-09-18 16:52:12 -07:00
Adam Powell
ac0f0d5792
Fix bug 5279720 - Legacy theme EditText coloring
...
Change-Id: Iced9d4d34b48bcf5d060a82fefd6d70a8c921e3f
2011-09-18 16:28:16 -07:00
Adam Powell
e891e7ab87
am d413eb38: Merge "Fix bug 5333962 - Problems with no action bar/overlay action mode"
...
* commit 'd413eb3861aae87386d418e9af4875f6f330cd05':
Fix bug 5333962 - Problems with no action bar/overlay action mode
2011-09-18 15:40:41 -07:00
Adam Powell
8ee6d7c20e
Fix bug 5333962 - Problems with no action bar/overlay action mode
...
Change the standalone action mode window for overlay mode to be of
TYPE_APPLICATION. (This also fixes a bug where overflow menus would
not work properly on these types of action mode bars.)
Set exitFadeDuration on btn_cab_done_holo_* drawables.
Remove no-window-focus override selector states for selectable item
backgrounds to allow proper touch feedback on windows that do not have
focus but that the user can interact with.
Change-Id: Ib504866238708150d21e6183ff7b695869c05d3e
2011-09-18 15:34:00 -07:00
Gilles Debunne
1a6be3eb7b
Bug 5290461: change voice IME underline span color
...
Change-Id: I072cc480bfaabe9486261c695c88e845bfcd842e
2011-09-18 13:20:31 -07:00
Fred Quintana
b04fe4e82a
Continuation of the unified account chooser flow.
...
- made the UI match the spec
- added ability to force the account chooser to appear
- added ability to pass in a description that will override the stock one
- added ability to pass in requiredFeatures for addAccount
- added ability to pass in an authTokenType for addAccount
Bug: 5293377
Change-Id: I243c0fd6598c943b1f65753e1f5d3c86629f64f5
2011-09-16 22:55:08 -07:00
Amith Yamasani
284e630a9b
Make Volume control non-modal and allow touches underneath to take effect.
...
Bug: 5308506 "Video" App halts playback when volume slider is present
Change-Id: Ib0672384b9074af73d729d1f64db62e5a8882d80
2011-09-16 18:24:47 -07:00
Justin Ho
2357858a1d
Properly adding scrubber pressed/selected state
...
Change-Id: Iea2e65bd8c00b56dd2828de03946ee1257547944
2011-09-16 16:19:47 -07:00
Eric Fischer
a2a960b4a1
Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom
2011-09-16 16:17:45 -07:00
Eric Fischer
db506e7699
Import revised translations. DO NOT MERGE
...
Change-Id: Ibae2079f2de6ae74d12a88e3c6f6f52b3010990f
2011-09-16 15:18:46 -07:00
Justin Ho
ceed599a4a
am 07adee4a: am 218148f1: Merge "Revert "Adding selected state for scrubber control"" into ics-factoryrom
...
* commit '07adee4a559e1655c5c1c1ec2f3b9bc15c33ea61':
Revert "Adding selected state for scrubber control"
2011-09-16 14:50:57 -07:00
Justin Ho
07adee4a55
am 218148f1: Merge "Revert "Adding selected state for scrubber control"" into ics-factoryrom
...
* commit '218148f1ffb574282bdc72a1a4cc97b7129cf043':
Revert "Adding selected state for scrubber control"
2011-09-16 14:49:17 -07:00
Justin Ho
218148f1ff
Merge "Revert "Adding selected state for scrubber control"" into ics-factoryrom
2011-09-16 14:47:54 -07:00
Justin Ho
783ed0d647
Revert "Adding selected state for scrubber control"
...
This reverts commit a11aeeb36560959db321f9757d4c5eccfdfa7f63
2011-09-16 14:47:40 -07:00
Justin Ho
8dde71a558
am 9e1184f2: am 5855c0ca: Merge "Adding selected state for scrubber control" into ics-factoryrom
...
* commit '9e1184f2efda48c93eee356b0b4c420f77747cb2':
Adding selected state for scrubber control
2011-09-16 14:19:04 -07:00
Justin Ho
9e1184f2ef
am 5855c0ca: Merge "Adding selected state for scrubber control" into ics-factoryrom
...
* commit '5855c0ca68de7103e59e4a6e6996fba528cabd9a':
Adding selected state for scrubber control
2011-09-16 14:16:53 -07:00
Justin Ho
5855c0ca68
Merge "Adding selected state for scrubber control" into ics-factoryrom
2011-09-16 14:15:04 -07:00
Justin Ho
a11aeeb365
Adding selected state for scrubber control
...
Change-Id: I63147c80f7849d28ffe15d97e0b7e3f5c7bea5e1
2011-09-16 14:11:07 -07:00
Fred Quintana
3d5759b527
Merge "Add a generic account chooser/add account flow for apps." into ics-factoryrom
2011-09-16 12:13:30 -07:00
Brian Colonna
1d6ccd7f19
am 68a8cf4a: Merge "Properly laying out FaceLock on lockscreen"
...
* commit '68a8cf4a8e2829bc61c5f77cbb062a5ed143cd0a':
Properly laying out FaceLock on lockscreen
2011-09-16 06:10:25 -07:00
Brian Colonna
68a8cf4a8e
Merge "Properly laying out FaceLock on lockscreen"
2011-09-16 06:08:22 -07:00
Svetoslav Ganov
8893834f2b
am fd4d90b8: am 4e3bee76: Merge "MiltiWaveView accessibility improvement." into ics-factoryrom
...
* commit 'fd4d90b8204d9a4e2ab8ce4974019b8d81287ad8':
MiltiWaveView accessibility improvement.
2011-09-15 18:56:47 -07:00
Svetoslav Ganov
fd4d90b820
am 4e3bee76: Merge "MiltiWaveView accessibility improvement." into ics-factoryrom
...
* commit '4e3bee760a7f00e6ef3c89b937558df1ee6fcda0':
MiltiWaveView accessibility improvement.
2011-09-15 18:54:15 -07:00
Svetoslav Ganov
2a671ac905
MiltiWaveView accessibility improvement.
...
Now hover events behave s motion events in touch exploration mode.
The use no longer needs to find the handle and tap + hold to engage.
It is enough to move on top of it.
Now the handle is engaged, i.e. can be dragged, when the user passes
on top of it for both accessibility enabled and disabled.
bug:5253968
Change-Id: If70b44cb6db8a38432216b46ecddefb3e2bc3825
2011-09-15 18:21:37 -07:00
Fred Quintana
1121bb5e6f
Add a generic account chooser/add account flow for apps.
...
The activity is launched as follows:
Account account1 = new Account("account1@gmail.com", "com.google")
Account account2 = new Account("account2@gmail.com", "com.google")
ArrayList<Account> accounts = new ArrayList<Account>();
accounts.add(account1);
accounts.add(account2);
String[] accountTypes = new String[]{"com.google", "com.android.exchange"};
Bundle addAccountOptions = null;
Intent intent = AccountManager.newChooseAccountIntent(account1, accounts,
accountTypes, addAccountOptions);
startActivityForResult(intent, 0);
Change-Id: I05a467bdc3552a2e39397b0182879351f4324389
2011-09-15 17:40:43 -07:00
Fred Quintana
9d286aaf9a
am 569584be: Merge "Add a generic account chooser/add account flow for apps."
...
* commit '569584be0e51ca6aceb53aa81b5ecac23d1ca55b':
Add a generic account chooser/add account flow for apps.
2011-09-15 16:47:52 -07:00
Fred Quintana
569584be0e
Merge "Add a generic account chooser/add account flow for apps."
2011-09-15 16:44:53 -07:00
Fred Quintana
89e063113c
Add a generic account chooser/add account flow for apps.
...
The activity is launched as follows:
Account account1 = new Account("account1@gmail.com", "com.google")
Account account2 = new Account("account2@gmail.com", "com.google")
ArrayList<Account> accounts = new ArrayList<Account>();
accounts.add(account1);
accounts.add(account2);
String[] accountTypes = new String[]{"com.google", "com.android.exchange"};
Bundle addAccountOptions = null;
Intent intent = AccountManager.newChooseAccountIntent(account1, accounts,
accountTypes, addAccountOptions);
startActivityForResult(intent, 0);
Change-Id: I05a467bdc3552a2e39397b0182879351f4324389
2011-09-15 16:39:50 -07:00
Brian Colonna
4d7cee1e4b
Properly laying out FaceLock on lockscreen
...
- FaceLock area now specified in layout files instead of trying to
grab an existing view, which was only practical if pattern was
backup method
- Now fills area it is supposed to and works with pin as well as
pattern backup
- Backup method is no longer exposed behind FaceLock just before it
starts or just after it tells the lockscreen to unlock
- Added synchronized blocks so FaceLock cannot be told to stopUI by
two different threads at the same time
Change-Id: I3bfad6b44dbe0e3c2ea3c87d2978451c22a7484c
2011-09-15 17:18:56 -04:00
Dianne Hackborn
0641ebd723
am cb995121: Merge "Final (ha ha) API 14."
...
* commit 'cb995121ee4bb4da236e8181fbfbd33bc2f9173a':
Final (ha ha) API 14.
2011-09-15 00:34:38 -07:00
Dianne Hackborn
90d92e6098
Final (ha ha) API 14.
...
Change-Id: I164f9add571f7d825a10036e3b8c9e9eb854d732
2011-09-15 00:28:31 -07:00
Jeff Sharkey
686ce0cd3c
am 6f137466: Merge "Change data usage warning notification wording."
...
* commit '6f13746633e089d3468dbb8620f222ce6c140bd3':
Change data usage warning notification wording.
2011-09-14 20:29:58 -07:00
Jeff Sharkey
6f13746633
Merge "Change data usage warning notification wording."
2011-09-14 20:27:55 -07:00
Jeff Sharkey
8ca953da93
Change data usage warning notification wording.
...
Bug: 5308710
Change-Id: Ic807640a031a3edb03897634e638473d5a039ecc
2011-09-14 19:56:11 -07:00
Katherine Kuan
e0ca52803b
am bd3f8a2e: Merge "Swap default avatar"
...
* commit 'bd3f8a2e38ab46b33fa8afc6c4d8d613db9a6b2a':
Swap default avatar
2011-09-14 19:24:08 -07:00
Katherine Kuan
bd3f8a2e38
Merge "Swap default avatar"
2011-09-14 19:22:34 -07:00