drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
87,844 Commits 1 Branch 0 Tags
Commit Graph

87844 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Svetoslav Ganov
798af86dcc am 82e21b33: am 9ea8f390: Explore by touch enabled when screen magnification is on. 
* commit '82e21b33bde057ba21dde9ee2023d785b4b5a757':
  Explore by touch enabled when screen magnification is on.
 2012-10-01 10:14:19 -07:00
Mike Cleron
25bc59dd08 am eb43858e: am a995b6e3: Merge "Getting rid of blue outline in user switcher, instead brighten the user" into jb-mr1-dev 
* commit 'eb43858ea041dcb61b2de94f8fa9d069be5fc93c':
  Getting rid of blue outline in user switcher, instead brighten the user
 2012-10-01 10:13:58 -07:00
Jeff Brown
843b014aca am 489c1e9f: am 7f813202: Merge "Get rid of preventScreenOn()." into jb-mr1-dev 
* commit '489c1e9f82250770004ec9080778546b040f6146':
  Get rid of preventScreenOn().
 2012-10-01 10:13:52 -07:00
Jatin Lodhia
6c7169722f am bf07c7a9: am 7c3586c5: Merge "Make the theme for choose account and choose account type dialogs same." into jb-mr1-dev 
* commit 'bf07c7a93f7d8ae2d67eecf98ad76e60212e161b':
  Make the theme for choose account and choose account type dialogs same.
 2012-10-01 10:13:47 -07:00
Jim Miller
7b439a0e11 am 7b4386c6: am 1ed143ea: Merge "Clean up SIM PIN and PUK screens in keyguard." into jb-mr1-dev 
* commit '7b4386c6177c874208f7f221787fca9079d2b7c4':
  Clean up SIM PIN and PUK screens in keyguard.
 2012-10-01 10:13:43 -07:00
Irfan Sheriff
97a59e3be1 am bccfd5f2: am d3081bc9: Merge "Revert setting GO idle time out" into jb-mr1-dev 
* commit 'bccfd5f2dc0674ee8ae3c2fbf1482843393f72d6':
  Revert setting GO idle time out
 2012-10-01 10:13:34 -07:00
Dianne Hackborn
d698542867 am 66e92752: am 84215565: Merge "Fix issue #7255954: API Review: rename Dream to DreamService" into jb-mr1-dev 
* commit '66e92752260e4ef21e77a44379f3a6b8969b4d65':
  Fix issue #7255954: API Review: rename Dream to DreamService
 2012-10-01 10:13:25 -07:00
Svetoslav Ganov
8173646ea4 am 45cde607: am c5211780: Merge "Sending interaction end event at the end of a drag." into jb-mr1-dev 
* commit '45cde607d5c6dfe39675a12d3bc47a0bc74565a2':
  Sending interaction end event at the end of a drag.
 2012-10-01 10:13:12 -07:00
Svetoslav Ganov
82e21b33bd am 9ea8f390: Explore by touch enabled when screen magnification is on. 
* commit '9ea8f390dbe8123415b9d64ce1a31683012958d9':
  Explore by touch enabled when screen magnification is on.
 2012-09-29 23:54:17 -07:00
Svetoslav Ganov
9ea8f390db Explore by touch enabled when screen magnification is on. 
1. A recently added check was preventing touch exploration being
   disabled when the last touch exploring service was turned off.
   As a consequence enabling explore by touch was initializing the
   input filter with the magnification and the not disabled
   screen magnification features.
bug:7256223

Change-Id: I9ed5457705d625805462e4d316b2c8a5af9aabca
 2012-09-29 10:46:16 -07:00
Mike Cleron
eb43858ea0 am a995b6e3: Merge "Getting rid of blue outline in user switcher, instead brighten the user" into jb-mr1-dev 
* commit 'a995b6e37f20b3e7eebfb37d8868c1bc14906204':
  Getting rid of blue outline in user switcher, instead brighten the user
 2012-09-28 19:44:59 -07:00
Mike Cleron
a995b6e37f Merge "Getting rid of blue outline in user switcher, instead brighten the user" into jb-mr1-dev 2012-09-28 19:43:16 -07:00
Adam Cohen
9654329008 Getting rid of blue outline in user switcher, instead brighten the user 
Change-Id: I4817615cc28eb1fea35ecb5c3d69c4298c9cf2cf
 2012-09-28 19:28:41 -07:00
Jeff Brown
489c1e9f82 am 7f813202: Merge "Get rid of preventScreenOn()." into jb-mr1-dev 
* commit '7f813202cb08a829b59e17be749ffee4a2f482b8':
  Get rid of preventScreenOn().
 2012-09-28 19:08:17 -07:00
Jeff Brown
7f813202cb Merge "Get rid of preventScreenOn()." into jb-mr1-dev 2012-09-28 19:05:52 -07:00
Jatin Lodhia
bf07c7a93f am 7c3586c5: Merge "Make the theme for choose account and choose account type dialogs same." into jb-mr1-dev 
* commit '7c3586c576c7f7238274f1ffbc4577a57be0d1f1':
  Make the theme for choose account and choose account type dialogs same.
 2012-09-28 18:53:46 -07:00
Jatin Lodhia
7c3586c576 Merge "Make the theme for choose account and choose account type dialogs same." into jb-mr1-dev 2012-09-28 18:50:20 -07:00
Jim Miller
7b4386c617 am 1ed143ea: Merge "Clean up SIM PIN and PUK screens in keyguard." into jb-mr1-dev 
* commit '1ed143ea341d2dac29cc3aafaf2fbeb1b13c5251':
  Clean up SIM PIN and PUK screens in keyguard.
 2012-09-28 18:42:29 -07:00
Jim Miller
1ed143ea34 Merge "Clean up SIM PIN and PUK screens in keyguard." into jb-mr1-dev 2012-09-28 18:40:43 -07:00
Irfan Sheriff
bccfd5f2dc am d3081bc9: Merge "Revert setting GO idle time out" into jb-mr1-dev 
* commit 'd3081bc9a7bc4e3d729005d1841d2834c1fd62b5':
  Revert setting GO idle time out
 2012-09-28 18:24:07 -07:00
Jeff Brown
120664816a Get rid of preventScreenOn(). 
Bug: 7165399
Change-Id: I1968265ecd74fff4d85efd2ca03b1983425ea518
 2012-09-28 18:21:36 -07:00
Irfan Sheriff
d3081bc9a7 Merge "Revert setting GO idle time out" into jb-mr1-dev 2012-09-28 18:20:12 -07:00
Dianne Hackborn
66e9275226 am 84215565: Merge "Fix issue #7255954: API Review: rename Dream to DreamService" into jb-mr1-dev 
* commit '84215565dd5dda84db7fd35b8ae4ccb571465cd2':
  Fix issue #7255954: API Review: rename Dream to DreamService
 2012-09-28 18:20:02 -07:00
Dianne Hackborn
84215565dd Merge "Fix issue #7255954: API Review: rename Dream to DreamService" into jb-mr1-dev 2012-09-28 18:17:13 -07:00
Dianne Hackborn
be87e2f588 Fix issue #7255954: API Review: rename Dream to DreamService 
Change-Id: I89ecf2c3ec4fef09c0495aa68de11576f9cfd872
 2012-09-28 17:42:39 -07:00
Svetoslav Ganov
45cde607d5 am c5211780: Merge "Sending interaction end event at the end of a drag." into jb-mr1-dev 
* commit 'c5211780ce60cd77d31b4df0f708bb760daddd5d':
  Sending interaction end event at the end of a drag.
 2012-09-28 17:41:04 -07:00
Svetoslav Ganov
c5211780ce Merge "Sending interaction end event at the end of a drag." into jb-mr1-dev 2012-09-28 17:38:33 -07:00
Jean-Baptiste Queru
d872651d2f Merge from jb-mr1-aah-dev 
Change-Id: I80cbfca156c24f9dc1c4e1c0c717a7de2851c521
 2012-09-28 17:12:26 -07:00
Robert Greenwalt
9b3f7096a5 am 2c22bb85: Merge "Update Premium-SMS detection UI." into jb-mr1-dev 
* commit '2c22bb85f2f6233eb3986f37b92386000433c7aa':
  Update Premium-SMS detection UI.
 2012-09-28 17:10:00 -07:00
Adam Powell
7fb07337f8 am 4984ec72: Merge "Fix adjustViewBounds handling for ImageView" into jb-mr1-dev 
* commit '4984ec7222d86a9b507a9961363bf50d2b72df1b':
  Fix adjustViewBounds handling for ImageView
 2012-09-28 17:09:51 -07:00
Fabrice Di Meglio
d35b2dc7cc am be290dd8: Merge "Fix bug #7199562 UI mirroring for RTL locales (Arabic, Hebrew, Farsi): Play settings" into jb-mr1-dev 
* commit 'be290dd850c8e2c31830e2a87205499586f55353':
  Fix bug #7199562 UI mirroring for RTL locales (Arabic, Hebrew, Farsi): Play settings
 2012-09-28 17:09:45 -07:00
Craig Mautner
f362877193 am 106a6927: Merge "Keep callback reference from being null." into jb-mr1-dev 
* commit '106a69271dd303baae1c428e269e1ec62994ff57':
  Keep callback reference from being null.
 2012-09-28 17:09:41 -07:00
Dianne Hackborn
752cb20245 am 3ff8e1a8: Merge "Fix issue #7211769 and #7244492, thrash around on #7226656." into jb-mr1-dev 
* commit '3ff8e1a80058e5557d13693d3223e1aa011c0038':
  Fix issue #7211769 and #7244492, thrash around on #7226656.
 2012-09-28 17:09:37 -07:00
Dianne Hackborn
72fcbea43e am 1d352735: Merge "Fix issue #7202950: After clearing data, clear data button is still enabled." into jb-mr1-dev 
* commit '1d3527354396d3aa48b494fb409d680cce32dc8b':
  Fix issue #7202950: After clearing data, clear data button is still enabled.
 2012-09-28 17:06:48 -07:00
Svetoslav Ganov
46824214bb Sending interaction end event at the end of a drag. 
1. In explore-by-touch when the user slides two fingers in the same
   direction we consider it a drag gesture. We merge the pointers into
   one and deliver a touch event. When one of the pointers goes up
   we were transitioning into touch exploring state. This means that
   were transitioning to another state in the middle of a gesture which
   creates complications and leads for interaction end event not being
   sent.

   This change transitions out of dragging state when all pointers go up
   - simple and all events are properly sent. Consequentially, staring a
   drag the user has to lift all pointers to touch explore. Since usually
   users either drags or touch explores this seems the simplest and
   *least risky* fix.

bug:7253731

Change-Id: Ie8588fbe9b26cb81312bd7fd377c94732e41e3f8
 2012-09-28 17:04:14 -07:00
Jim Miller
3efe106264 Clean up SIM PIN and PUK screens in keyguard. 
- new flow for PUK screen
- clean up SIM and PUK screen to match UX designs
- simplified logic for showing emergency call button

Change-Id: I66fcd312f3c52dd212d9836dc020735dbc88d5ee
 2012-09-28 17:01:16 -07:00
Robert Greenwalt
8f188379b5 am 2c22bb85: Merge "Update Premium-SMS detection UI." into jb-mr1-dev 
* commit '2c22bb85f2f6233eb3986f37b92386000433c7aa':
  Update Premium-SMS detection UI.
 2012-09-28 17:00:57 -07:00
Robert Greenwalt
a6c9a612af resolved conflicts for merge of 925a659d to jb-mr1-aah-dev 
Change-Id: I520c5df139c88cc0fecaeffdc9e2b5eb8dd352aa
 2012-09-28 17:00:00 -07:00
Robert Greenwalt
2c22bb85f2 Merge "Update Premium-SMS detection UI." into jb-mr1-dev 2012-09-28 16:55:44 -07:00
Irfan Sheriff
ce6fc8d7a4 Revert setting GO idle time out 
GO idle time out causes issues with multi-channel capable client which
can take longer to connect.

Use the supplicant default detection when acting as a GO.

Bug: 7254008
Change-Id: I6c40081cfa83ca0ddbb764640a48c92d69e609fd
 2012-09-28 16:53:33 -07:00
Jean-Baptiste Queru
3c45765a2a Merge from jb-mr1-aah-dev 
Change-Id: I4deb6ff1d3c9e00aefacbe772227bf43c139ecca
 2012-09-28 16:44:18 -07:00
Adam Powell
2e35df06e7 am 4984ec72: Merge "Fix adjustViewBounds handling for ImageView" into jb-mr1-dev 
* commit '4984ec7222d86a9b507a9961363bf50d2b72df1b':
  Fix adjustViewBounds handling for ImageView
 2012-09-28 16:19:36 -07:00
Adam Powell
4984ec7222 Merge "Fix adjustViewBounds handling for ImageView" into jb-mr1-dev 2012-09-28 16:15:36 -07:00
Fabrice Di Meglio
59294a26b4 am be290dd8: Merge "Fix bug #7199562 UI mirroring for RTL locales (Arabic, Hebrew, Farsi): Play settings" into jb-mr1-dev 
* commit 'be290dd850c8e2c31830e2a87205499586f55353':
  Fix bug #7199562 UI mirroring for RTL locales (Arabic, Hebrew, Farsi): Play settings
 2012-09-28 16:14:37 -07:00
Fabrice Di Meglio
be290dd850 Merge "Fix bug #7199562 UI mirroring for RTL locales (Arabic, Hebrew, Farsi): Play settings" into jb-mr1-dev 2012-09-28 16:12:15 -07:00
Craig Mautner
8cf5910d1e am 106a6927: Merge "Keep callback reference from being null." into jb-mr1-dev 
* commit '106a69271dd303baae1c428e269e1ec62994ff57':
  Keep callback reference from being null.
 2012-09-28 16:00:13 -07:00
Dianne Hackborn
fbbd0072eb am 3ff8e1a8: Merge "Fix issue #7211769 and #7244492, thrash around on #7226656." into jb-mr1-dev 
* commit '3ff8e1a80058e5557d13693d3223e1aa011c0038':
  Fix issue #7211769 and #7244492, thrash around on #7226656.
 2012-09-28 16:00:09 -07:00
Dianne Hackborn
b74e802fe5 am 1d352735: Merge "Fix issue #7202950: After clearing data, clear data button is still enabled." into jb-mr1-dev 
* commit '1d3527354396d3aa48b494fb409d680cce32dc8b':
  Fix issue #7202950: After clearing data, clear data button is still enabled.
 2012-09-28 15:55:11 -07:00
Craig Mautner
106a69271d Merge "Keep callback reference from being null." into jb-mr1-dev 2012-09-28 15:54:44 -07:00
Dianne Hackborn
3ff8e1a800 Merge "Fix issue #7211769 and #7244492, thrash around on #7226656." into jb-mr1-dev 2012-09-28 15:54:44 -07:00